don't make a syslog handler if we didn't ask for one

This commit is contained in:
termie
2011-02-22 17:10:34 -08:00
parent 14641a62b7
commit 012dbe554f

View File

@@ -236,16 +236,17 @@ class NovaRootLogger(NovaLogger):
def __init__(self, name, level=NOTSET): def __init__(self, name, level=NOTSET):
self.logpath = None self.logpath = None
self.filelog = None self.filelog = None
self.syslog = SysLogHandler(address='/dev/log')
self.streamlog = StreamHandler() self.streamlog = StreamHandler()
self.syslog = None
NovaLogger.__init__(self, name, level) NovaLogger.__init__(self, name, level)
def setup_from_flags(self): def setup_from_flags(self):
"""Setup logger from flags""" """Setup logger from flags"""
global _filelog global _filelog
if FLAGS.use_syslog: if FLAGS.use_syslog:
self.syslog = SysLogHandler(address='/dev/log')
self.addHandler(self.syslog) self.addHandler(self.syslog)
else: elif self.syslog:
self.removeHandler(self.syslog) self.removeHandler(self.syslog)
logpath = _get_log_file_path() logpath = _get_log_file_path()
if logpath: if logpath: