From 5342de1031379b3edf708594e197bbaef8562872 Mon Sep 17 00:00:00 2001 From: Goffi Date: Thu, 21 Aug 2014 02:14:24 +0200 Subject: [PATCH] core (logging): logging is added to stdout in nodaemon mode (it was already the case in debug mode) --- src/core/log_config.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core/log_config.py b/src/core/log_config.py index c10463fc..5d6c0c53 100644 --- a/src/core/log_config.py +++ b/src/core/log_config.py @@ -187,10 +187,15 @@ class ConfigureTwisted(ConfigureBasic): addObserver = self.twisted_log.addObserver if C.LOG_OPT_OUTPUT_DEFAULT in log.handlers: - # default output is already managed, we just add output to stdout if we are in debug mode - from twisted.internet import defer - if defer.Deferred.debug: - addObserver(self.twisted_log.FileLogObserver(sys.stdout).emit) + # default output is already managed, we just add output to stdout if we are in debug or nodaemon mode + + # XXX: this hack is to know if we are in debug or nodaemon mode + # any better method welcomed + from twisted.scripts import twistd + options = twistd.ServerOptions() + options.parseOptions() + if options.get('nodaemon', False) or options.get('debug', False): + addObserver(self.twisted_log.FileLogObserver(sys.stdout).emit) else: # \\default is not in the output, so we remove current observers self.cleared_observers = self.log_publisher.observers