summaryrefslogtreecommitdiffstats
path: root/deluge/log.py
diff options
context:
space:
mode:
authorbendikro <bro.devel+deluge@gmail.com>2016-06-08 14:14:00 +0200
committerCalum Lind <calumlind+deluge@gmail.com>2016-10-18 21:26:22 +0100
commitc8a3fd72d411bfbb6258490bbd3b65a253fba983 (patch)
tree2b5b64559a8a4a36726e32bbebf06214bbd5b5d4 /deluge/log.py
parent9788ca08ea6ece3da84f9c5b6cef81e8a413c0a7 (diff)
downloaddeluge-c8a3fd72d411bfbb6258490bbd3b65a253fba983.tar.gz
deluge-c8a3fd72d411bfbb6258490bbd3b65a253fba983.tar.bz2
deluge-c8a3fd72d411bfbb6258490bbd3b65a253fba983.zip
[Tests] Improve UI entry script tests
* Added parameter log.setup_logger to prevent output noise in unit tests
Diffstat (limited to 'deluge/log.py')
-rw-r--r--deluge/log.py8
1 files changed, 5 insertions, 3 deletions
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):