From f21de3b01bfa6e7d6733dee772683fce203b87b1 Mon Sep 17 00:00:00 2001 From: Goffi Date: Sun, 24 Aug 2014 18:44:17 +0200 Subject: [PATCH] core (logging): fixed twisted backend for twistd plugin, /!\ stdout logging in debug/nodaemon mode does'nt work anymore with .tac files. --- src/core/log_config.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/core/log_config.py b/src/core/log_config.py index 5d6c0c53..e09e65c5 100644 --- a/src/core/log_config.py +++ b/src/core/log_config.py @@ -189,13 +189,16 @@ class ConfigureTwisted(ConfigureBasic): 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 or nodaemon mode + def postOptions(options): # called after options are parsed + if options.get('nodaemon', False) or options.get('debug', False): + addObserver(self.twisted_log.FileLogObserver(sys.stdout).emit) + # 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) + # we monkey patch ServerOptions to be sure options.get is done after options are fully parsed + # XXX: only works with twistd plugins, not with .tac files ! + twistd.ServerOptions.postOptions = postOptions else: # \\default is not in the output, so we remove current observers self.cleared_observers = self.log_publisher.observers