summaryrefslogtreecommitdiffstats
path: root/nova/log.py
diff options
context:
space:
mode:
authortermie <github@anarkystic.com>2011-02-22 17:10:34 -0800
committertermie <github@anarkystic.com>2011-02-22 17:10:34 -0800
commit5b2ec209d07d7df45f9b7ca6eebfcbc9443de94e (patch)
tree6ac1801cf78adc33b2d3f4e8038b7642f4ddfec6 /nova/log.py
parent3180d5dcf928f3c47e318b41affbc956bd5e2174 (diff)
downloadnova-5b2ec209d07d7df45f9b7ca6eebfcbc9443de94e.tar.gz
nova-5b2ec209d07d7df45f9b7ca6eebfcbc9443de94e.tar.xz
nova-5b2ec209d07d7df45f9b7ca6eebfcbc9443de94e.zip
don't make a syslog handler if we didn't ask for one
Diffstat (limited to 'nova/log.py')
-rw-r--r--nova/log.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/log.py b/nova/log.py
index 10c14d74b..591d26c63 100644
--- a/nova/log.py
+++ b/nova/log.py
@@ -236,16 +236,17 @@ class NovaRootLogger(NovaLogger):
def __init__(self, name, level=NOTSET):
self.logpath = None
self.filelog = None
- self.syslog = SysLogHandler(address='/dev/log')
self.streamlog = StreamHandler()
+ self.syslog = None
NovaLogger.__init__(self, name, level)
def setup_from_flags(self):
"""Setup logger from flags"""
global _filelog
if FLAGS.use_syslog:
+ self.syslog = SysLogHandler(address='/dev/log')
self.addHandler(self.syslog)
- else:
+ elif self.syslog:
self.removeHandler(self.syslog)
logpath = _get_log_file_path()
if logpath: