comparison src/core/log_config.py @ 1116:ee450d7c88a7

core (logging): logging is added to stdout in nodaemon mode (it was already the case in debug mode)
author Goffi <goffi@goffi.org>
date Thu, 21 Aug 2014 02:14:24 +0200
parents a836b6da2c5c
children 64ff259d3cbb
comparison
equal deleted inserted replaced
1115:b56374a1f6d6 1116:ee450d7c88a7
185 output = C.LOG_OPT_OUTPUT_SEP + C.LOG_OPT_OUTPUT_DEFAULT 185 output = C.LOG_OPT_OUTPUT_SEP + C.LOG_OPT_OUTPUT_DEFAULT
186 self.manageOutputs(output) 186 self.manageOutputs(output)
187 addObserver = self.twisted_log.addObserver 187 addObserver = self.twisted_log.addObserver
188 188
189 if C.LOG_OPT_OUTPUT_DEFAULT in log.handlers: 189 if C.LOG_OPT_OUTPUT_DEFAULT in log.handlers:
190 # default output is already managed, we just add output to stdout if we are in debug mode 190 # default output is already managed, we just add output to stdout if we are in debug or nodaemon mode
191 from twisted.internet import defer 191
192 if defer.Deferred.debug: 192 # XXX: this hack is to know if we are in debug or nodaemon mode
193 addObserver(self.twisted_log.FileLogObserver(sys.stdout).emit) 193 # any better method welcomed
194 from twisted.scripts import twistd
195 options = twistd.ServerOptions()
196 options.parseOptions()
197 if options.get('nodaemon', False) or options.get('debug', False):
198 addObserver(self.twisted_log.FileLogObserver(sys.stdout).emit)
194 else: 199 else:
195 # \\default is not in the output, so we remove current observers 200 # \\default is not in the output, so we remove current observers
196 self.cleared_observers = self.log_publisher.observers 201 self.cleared_observers = self.log_publisher.observers
197 self.observers.clear() 202 self.observers.clear()
198 del self.log_publisher.observers[:] 203 del self.log_publisher.observers[:]