From 1cfeb853a5e874abaf7ebdfb4134782f519c1b29 Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Sat, 25 Feb 2023 19:26:38 -0500 Subject: [PATCH] update_manager: improve logging Add a debug logging helper to the base class. Use unique logging prefixes for subclasses of AppDeploy. Signed-off-by: Eric Callahan --- moonraker/components/update_manager/app_deploy.py | 6 ++++-- moonraker/components/update_manager/base_deploy.py | 4 ++++ moonraker/components/update_manager/git_deploy.py | 2 +- moonraker/components/update_manager/zip_deploy.py | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/moonraker/components/update_manager/app_deploy.py b/moonraker/components/update_manager/app_deploy.py index a9fe1e6..81dbf03 100644 --- a/moonraker/components/update_manager/app_deploy.py +++ b/moonraker/components/update_manager/app_deploy.py @@ -48,8 +48,10 @@ DISTRO_ALIASES = [distro.id()] DISTRO_ALIASES.extend(distro.like().split()) class AppDeploy(BaseDeploy): - def __init__(self, config: ConfigHelper, cmd_helper: CommandHelper) -> None: - super().__init__(config, cmd_helper, prefix="Application") + def __init__( + self, config: ConfigHelper, cmd_helper: CommandHelper, prefix: str + ) -> None: + super().__init__(config, cmd_helper, prefix=prefix) self.config = config type_choices = list(TYPE_TO_CHANNEL.keys()) self.type = config.get('type').lower() diff --git a/moonraker/components/update_manager/base_deploy.py b/moonraker/components/update_manager/base_deploy.py index 6440083..57d5b14 100644 --- a/moonraker/components/update_manager/base_deploy.py +++ b/moonraker/components/update_manager/base_deploy.py @@ -91,6 +91,10 @@ class BaseDeploy: log_msg = f"{self.prefix}{msg}" logging.info(log_msg) + def log_debug(self, msg: str) -> None: + log_msg = f"{self.prefix}{msg}" + logging.debug(log_msg) + def notify_status(self, msg: str, is_complete: bool = False) -> None: log_msg = f"{self.prefix}{msg}" logging.debug(log_msg) diff --git a/moonraker/components/update_manager/git_deploy.py b/moonraker/components/update_manager/git_deploy.py index 21ab500..87750b1 100644 --- a/moonraker/components/update_manager/git_deploy.py +++ b/moonraker/components/update_manager/git_deploy.py @@ -30,7 +30,7 @@ if TYPE_CHECKING: class GitDeploy(AppDeploy): def __init__(self, config: ConfigHelper, cmd_helper: CommandHelper) -> None: - super().__init__(config, cmd_helper) + super().__init__(config, cmd_helper, "Git Repo") self._configure_path(config) self._configure_virtualenv(config) self._configure_dependencies(config) diff --git a/moonraker/components/update_manager/zip_deploy.py b/moonraker/components/update_manager/zip_deploy.py index 3915de0..b166411 100644 --- a/moonraker/components/update_manager/zip_deploy.py +++ b/moonraker/components/update_manager/zip_deploy.py @@ -36,7 +36,7 @@ RINFO_KEYS = [ class ZipDeploy(AppDeploy): def __init__(self, config: ConfigHelper, cmd_helper: CommandHelper) -> None: - super().__init__(config, cmd_helper) + super().__init__(config, cmd_helper, "Zip Dist") self._configure_path(config) self._configure_virtualenv(config) self._configure_dependencies(config, node_only=True)