From e698a09b1ffef5f3bb2420115ae11a9b55d733e7 Mon Sep 17 00:00:00 2001 From: Harold Zeng Date: Fri, 10 Apr 2020 04:55:03 +0000 Subject: [PATCH 1/3] respect cli config about logging --- src/azure-cli-core/azure/cli/core/azlogging.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/azure-cli-core/azure/cli/core/azlogging.py b/src/azure-cli-core/azure/cli/core/azlogging.py index 4ff3c8afb91..10e66f5daab 100644 --- a/src/azure-cli-core/azure/cli/core/azlogging.py +++ b/src/azure-cli-core/azure/cli/core/azlogging.py @@ -77,8 +77,10 @@ def _delete_old_logs(log_dir): cmd_logger = logging.getLogger(AzCliLogging._COMMAND_METADATA_LOGGER) - self._init_command_logfile_handlers(cmd_logger, args) # pylint: disable=protected-access - get_logger(__name__).debug("metadata file logging enabled - writing logs to '%s'.", self.command_log_dir) + if self.file_log_enabled: + self._init_command_logfile_handlers(cmd_logger, args) # pylint: disable=protected-access + get_logger(__name__).debug("metadata file logging enabled - writing logs to '%s'.", + self.command_log_dir) _delete_old_logs(self.command_log_dir) From 0d5d35c95d2ae0fed9fd5f956fb7e7f0f3cb5293 Mon Sep 17 00:00:00 2001 From: Harold Zeng Date: Fri, 10 Apr 2020 05:14:36 +0000 Subject: [PATCH 2/3] init ~/.azure/commands only when enable logger to file --- src/azure-cli-core/azure/cli/core/azlogging.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli-core/azure/cli/core/azlogging.py b/src/azure-cli-core/azure/cli/core/azlogging.py index 10e66f5daab..a041226ddd5 100644 --- a/src/azure-cli-core/azure/cli/core/azlogging.py +++ b/src/azure-cli-core/azure/cli/core/azlogging.py @@ -82,7 +82,7 @@ def _delete_old_logs(log_dir): get_logger(__name__).debug("metadata file logging enabled - writing logs to '%s'.", self.command_log_dir) - _delete_old_logs(self.command_log_dir) + _delete_old_logs(self.command_log_dir) def _init_command_logfile_handlers(self, command_metadata_logger, args): From 4d91968e4125158fd3fa69173e5b0b2b83dce48d Mon Sep 17 00:00:00 2001 From: Harold Zeng Date: Fri, 10 Apr 2020 06:42:44 +0000 Subject: [PATCH 3/3] enable file logging by default --- src/azure-cli-core/azure/cli/core/azlogging.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/azure-cli-core/azure/cli/core/azlogging.py b/src/azure-cli-core/azure/cli/core/azlogging.py index a041226ddd5..bcd11ece965 100644 --- a/src/azure-cli-core/azure/cli/core/azlogging.py +++ b/src/azure-cli-core/azure/cli/core/azlogging.py @@ -77,6 +77,9 @@ def _delete_old_logs(log_dir): cmd_logger = logging.getLogger(AzCliLogging._COMMAND_METADATA_LOGGER) + # overwrite CLILogging._is_file_log_enabled() from knack + self.file_log_enabled = cli_ctx.config.getboolean('logging', 'enable_log_file', fallback=True) + if self.file_log_enabled: self._init_command_logfile_handlers(cmd_logger, args) # pylint: disable=protected-access get_logger(__name__).debug("metadata file logging enabled - writing logs to '%s'.",