From 1d8cec63d16c96ac76484f75874af4e528e58b6c Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Mon, 15 Jun 2009 18:50:47 -0300 Subject: [PATCH] scrapy.log: check if twisted log started before --- scrapy/log/__init__.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/scrapy/log/__init__.py b/scrapy/log/__init__.py index dbfb87106..f9671e006 100644 --- a/scrapy/log/__init__.py +++ b/scrapy/log/__init__.py @@ -34,19 +34,21 @@ def start(logfile=None, loglevel=None, log_stdout=None): """Initialize and start logging facility""" global log_level, started + # set loglevel + loglevel = loglevel or settings['LOGLEVEL'] + log_level = globals()[loglevel] if loglevel else DEBUG if started or not settings.getbool('LOG_ENABLED'): return - - logfile = logfile or settings['LOGFILE'] - loglevel = loglevel or settings['LOGLEVEL'] - log_stdout = log_stdout or settings.getbool('LOG_STDOUT') - - file = open(logfile, 'a') if logfile else sys.stderr - level = int(getattr(sys.modules[__name__], loglevel)) if loglevel else DEBUG - log.startLogging(file, setStdout=log_stdout) - log_level = level started = True + # set log observer + if log.defaultObserver: # check twisted log not already started + logfile = logfile or settings['LOGFILE'] + log_stdout = log_stdout or settings.getbool('LOG_STDOUT') + + file = open(logfile, 'a') if logfile else sys.stderr + log.startLogging(file, setStdout=log_stdout) + def msg(message, level=INFO, component=BOT_NAME, domain=None): """Log message according to the level""" component = "%s/%s" % (component, domain) if domain else component