From c8a3fd72d411bfbb6258490bbd3b65a253fba983 Mon Sep 17 00:00:00 2001 From: bendikro Date: Wed, 8 Jun 2016 14:14:00 +0200 Subject: [Tests] Improve UI entry script tests * Added parameter log.setup_logger to prevent output noise in unit tests --- deluge/log.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'deluge/log.py') diff --git a/deluge/log.py b/deluge/log.py index faf2a011f..35513c066 100644 --- a/deluge/log.py +++ b/deluge/log.py @@ -107,7 +107,7 @@ levels = { } -def setup_logger(level="error", filename=None, filemode="w", logrotate=None): +def setup_logger(level="error", filename=None, filemode="w", logrotate=None, twisted_observer=True): """ Sets up the basic logger and if `:param:filename` is set, then it will log to that file instead of stdout. @@ -119,6 +119,7 @@ def setup_logger(level="error", filename=None, filemode="w", logrotate=None): filemode (str): The filemode to use when opening the log file logrotate (int, optional): The size of the logfile in bytes when enabling log rotation (Default is None meaning disabled) + twisted_observer (bool): Whether to setup the custom twisted logging observer. """ if logging.getLoggerClass() is not Logging: logging.setLoggerClass(Logging) @@ -153,8 +154,9 @@ def setup_logger(level="error", filename=None, filemode="w", logrotate=None): root_logger.addHandler(handler) root_logger.setLevel(level) - twisted_logging = TwistedLoggingObserver() - twisted_logging.start() + if twisted_observer: + twisted_logging = TwistedLoggingObserver() + twisted_logging.start() class TwistedLoggingObserver(PythonLoggingObserver): -- cgit