From 9f0c8071787ee6c74c2ce61484c8a782dccb52d8 Mon Sep 17 00:00:00 2001 From: Vitali Stupin Date: Wed, 22 Nov 2023 11:44:27 +0200 Subject: [PATCH] Fix duplicate logging Currently check `handler is WatchedFileHandler` always fails and a new handler is added every time _setup_logger is called. For example corrector logs every line three times. A fix for opendata was added with pull request https://github.com/nordic-institute/X-Road-Metrics/pull/14 This commit makes the same change in all the other services. --- analysis_module/opmon_analyzer/logger_manager.py | 2 +- analysis_ui_module/opmon_analyzer_ui/logger_manager.py | 2 +- anonymizer_module/opmon_anonymizer/utils/logger_manager.py | 2 +- collector_module/opmon_collector/logger_manager.py | 2 +- corrector_module/opmon_corrector/logger_manager.py | 2 +- reports_module/opmon_reports/logger_manager.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/analysis_module/opmon_analyzer/logger_manager.py b/analysis_module/opmon_analyzer/logger_manager.py index d8481e9d..4352f836 100644 --- a/analysis_module/opmon_analyzer/logger_manager.py +++ b/analysis_module/opmon_analyzer/logger_manager.py @@ -58,7 +58,7 @@ def _create_file_handler(self): def _handler_is_set(self, handlers): for handler in handlers: - if handler is WatchedFileHandler and os.path.abspath(self.log_path) == handler.baseFilename: + if isinstance(handler, WatchedFileHandler) and os.path.abspath(self.log_path) == handler.baseFilename: return True return False diff --git a/analysis_ui_module/opmon_analyzer_ui/logger_manager.py b/analysis_ui_module/opmon_analyzer_ui/logger_manager.py index d8481e9d..4352f836 100644 --- a/analysis_ui_module/opmon_analyzer_ui/logger_manager.py +++ b/analysis_ui_module/opmon_analyzer_ui/logger_manager.py @@ -58,7 +58,7 @@ def _create_file_handler(self): def _handler_is_set(self, handlers): for handler in handlers: - if handler is WatchedFileHandler and os.path.abspath(self.log_path) == handler.baseFilename: + if isinstance(handler, WatchedFileHandler) and os.path.abspath(self.log_path) == handler.baseFilename: return True return False diff --git a/anonymizer_module/opmon_anonymizer/utils/logger_manager.py b/anonymizer_module/opmon_anonymizer/utils/logger_manager.py index b40a849b..e90a48c8 100644 --- a/anonymizer_module/opmon_anonymizer/utils/logger_manager.py +++ b/anonymizer_module/opmon_anonymizer/utils/logger_manager.py @@ -58,7 +58,7 @@ def _create_file_handler(self): def _handler_is_set(self, handlers): for handler in handlers: - if handler is WatchedFileHandler and os.path.abspath(self.log_path) == handler.baseFilename: + if isinstance(handler, WatchedFileHandler) and os.path.abspath(self.log_path) == handler.baseFilename: return True return False diff --git a/collector_module/opmon_collector/logger_manager.py b/collector_module/opmon_collector/logger_manager.py index b40a849b..e90a48c8 100644 --- a/collector_module/opmon_collector/logger_manager.py +++ b/collector_module/opmon_collector/logger_manager.py @@ -58,7 +58,7 @@ def _create_file_handler(self): def _handler_is_set(self, handlers): for handler in handlers: - if handler is WatchedFileHandler and os.path.abspath(self.log_path) == handler.baseFilename: + if isinstance(handler, WatchedFileHandler) and os.path.abspath(self.log_path) == handler.baseFilename: return True return False diff --git a/corrector_module/opmon_corrector/logger_manager.py b/corrector_module/opmon_corrector/logger_manager.py index ed78e652..cf74c27c 100644 --- a/corrector_module/opmon_corrector/logger_manager.py +++ b/corrector_module/opmon_corrector/logger_manager.py @@ -58,7 +58,7 @@ def _create_file_handler(self): def _handler_is_set(self, handlers): for handler in handlers: - if handler is WatchedFileHandler and os.path.abspath(self.log_path) == handler.baseFilename: + if isinstance(handler, WatchedFileHandler) and os.path.abspath(self.log_path) == handler.baseFilename: return True return False diff --git a/reports_module/opmon_reports/logger_manager.py b/reports_module/opmon_reports/logger_manager.py index d8481e9d..4352f836 100644 --- a/reports_module/opmon_reports/logger_manager.py +++ b/reports_module/opmon_reports/logger_manager.py @@ -58,7 +58,7 @@ def _create_file_handler(self): def _handler_is_set(self, handlers): for handler in handlers: - if handler is WatchedFileHandler and os.path.abspath(self.log_path) == handler.baseFilename: + if isinstance(handler, WatchedFileHandler) and os.path.abspath(self.log_path) == handler.baseFilename: return True return False