From 67d6b1e7244ea34fca6b7f585e4e070ae23378c5 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Wed, 10 Jul 2019 03:12:56 +0200 Subject: [PATCH] Fix double logging when running tests --- src/Config.py | 8 +++++--- src/Test/conftest.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Config.py b/src/Config.py index 1f9dcaee..bb78cac5 100644 --- a/src/Config.py +++ b/src/Config.py @@ -573,7 +573,7 @@ class Config(object): logging.getLogger('').setLevel(logging.getLevelName(self.log_level)) logging.getLogger('').addHandler(file_logger) - def initLogging(self): + def initLogging(self, console_logging=True, file_logging=True): # Create necessary files and dirs if not os.path.isdir(self.log_dir): os.mkdir(self.log_dir) @@ -589,7 +589,9 @@ class Config(object): logging.getLogger('').name = "-" # Remove root prefix logging.getLogger("geventwebsocket.handler").setLevel(logging.WARNING) # Don't log ws debug messages - self.initConsoleLogger() - self.initFileLogger() + if console_logging: + self.initConsoleLogger() + if file_logging: + self.initFileLogger() config = Config(sys.argv) diff --git a/src/Test/conftest.py b/src/Test/conftest.py index b4c96d0e..1f068d69 100644 --- a/src/Test/conftest.py +++ b/src/Test/conftest.py @@ -68,7 +68,7 @@ config.verbose = True # Use test data for unittests config.tor = "disable" # Don't start Tor client config.trackers = [] config.data_dir = TEST_DATA_PATH # Use test data for unittests -config.initLogging() +config.initLogging(console_logging=False) # Set custom formatter with realative time format (via: https://stackoverflow.com/questions/31521859/python-logging-module-time-since-last-log) class TimeFilter(logging.Filter):