From 4fe8d6315a3c072fc0c158f264de2ba1b9eaed1e Mon Sep 17 00:00:00 2001 From: "Julien M." Date: Wed, 5 Jun 2024 14:01:12 +0200 Subject: [PATCH] improve(logs): refine logs configuration --- dicogis/cli/cmd_inventory.py | 2 +- dicogis/cli/cmd_publish.py | 15 ++++++++------- dicogis/utils/journalizer.py | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dicogis/cli/cmd_inventory.py b/dicogis/cli/cmd_inventory.py index e0e40165..65eb678b 100644 --- a/dicogis/cli/cmd_inventory.py +++ b/dicogis/cli/cmd_inventory.py @@ -274,7 +274,7 @@ def inventory( logmngr = LogManager( console_level=logging.DEBUG if verbose else logging.WARNING, file_level=logging.DEBUG if verbose else logging.INFO, - label=f"{__package_name__}-cli", + label=f"{__package_name__}-cli-inventory", folder=Path(app_dir).joinpath("logs"), ) # add headers diff --git a/dicogis/cli/cmd_publish.py b/dicogis/cli/cmd_publish.py index 1437abee..19de6892 100644 --- a/dicogis/cli/cmd_publish.py +++ b/dicogis/cli/cmd_publish.py @@ -100,8 +100,8 @@ def publish( logmngr = LogManager( console_level=logging.DEBUG if verbose else logging.WARNING, - file_level=logging.DEBUG if verbose else logging.INFO, - label=f"{__package_name__}-cli", + file_level=logging.DEBUG if verbose else logging.WARNING, + label=f"{__package_name__}-cli-publish", folder=Path(app_dir).joinpath("logs"), ) # add headers @@ -193,11 +193,12 @@ def publish( or data.get("extras", {}).get("dicogis_signature") in already_published_signature ): - console_out.print( - f"JSON file {json_file} has the same slug or the same signature " - f"compared with {len(already_published_datasets)} already published " - "datasets. It's not gonna be published." - ) + if verbose: + console_out.print( + f"JSON file {json_file} has the same slug or the same signature " + f"compared with {len(already_published_datasets)} already published " + "datasets. It's not gonna be published." + ) counter_ignored += 1 continue diff --git a/dicogis/utils/journalizer.py b/dicogis/utils/journalizer.py index e0c6ef4b..68a41f6f 100644 --- a/dicogis/utils/journalizer.py +++ b/dicogis/utils/journalizer.py @@ -96,7 +96,7 @@ def initial_logger_config(self) -> logging.Logger: # create main logger logging.captureWarnings(False) logger = logging.getLogger() - logger.setLevel(logging.INFO) + logger.setLevel(min(self.console_level, self.file_level)) # create console handler - seems to be ignored by click log_console_handler = logging.StreamHandler()