From bc5219fe3d50d80d3169e9cd54f8a24a4d3157fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20L=C3=B6sche?= Date: Thu, 2 Feb 2023 17:38:34 +0100 Subject: [PATCH] [fix][plugins/onprem] Fix log formating in forked onprem collector (#1406) --- plugins/onprem/resoto_plugin_onprem/__init__.py | 6 +++--- plugins/onprem/resoto_plugin_onprem/resources.py | 4 +--- plugins/onprem/resoto_plugin_onprem/ssh.py | 4 +--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/plugins/onprem/resoto_plugin_onprem/__init__.py b/plugins/onprem/resoto_plugin_onprem/__init__.py index 97a1ef699..c384d22d0 100644 --- a/plugins/onprem/resoto_plugin_onprem/__init__.py +++ b/plugins/onprem/resoto_plugin_onprem/__init__.py @@ -1,5 +1,4 @@ from resotolib.baseresources import BaseResource -import resotolib.logger import socket import multiprocessing import resotolib.proc @@ -13,8 +12,7 @@ from .config import OnpremConfig from paramiko import ssh_exception from typing import Dict - -log = resotolib.logger.getLogger("resoto." + __name__) +from resotolib.logger import log, setup_logger class OnpremCollectorPlugin(BaseCollectorPlugin): @@ -104,6 +102,8 @@ def add_config(config: Config) -> None: def collect_server(srv: Dict, args: Namespace = None, running_config: RunningConfig = None) -> Dict: if args is not None: ArgumentParser.args = args + setup_logger("resotoworker-onprem", force=True, level=getattr(args, "log_level", None)) + if running_config is not None: Config.running_config.apply(running_config) diff --git a/plugins/onprem/resoto_plugin_onprem/resources.py b/plugins/onprem/resoto_plugin_onprem/resources.py index e04fdac57..27a60525d 100644 --- a/plugins/onprem/resoto_plugin_onprem/resources.py +++ b/plugins/onprem/resoto_plugin_onprem/resources.py @@ -1,4 +1,3 @@ -import resotolib.logger from attrs import define from typing import Optional, ClassVar from resotolib.graph import Graph @@ -8,8 +7,7 @@ BaseInstance, BaseNetwork, ) - -log = resotolib.logger.getLogger("resoto." + __name__) +from resotolib.logger import log @define(eq=False, slots=False) diff --git a/plugins/onprem/resoto_plugin_onprem/ssh.py b/plugins/onprem/resoto_plugin_onprem/ssh.py index 9f0745926..33007392f 100644 --- a/plugins/onprem/resoto_plugin_onprem/ssh.py +++ b/plugins/onprem/resoto_plugin_onprem/ssh.py @@ -1,10 +1,8 @@ -import resotolib.logger from collections import defaultdict from paramiko import SSHClient from .resources import OnpremInstance from resotolib.baseresources import InstanceStatus - -log = resotolib.logger.getLogger("resoto." + __name__) +from resotolib.logger import log instance_status_map = {