From 5b2ec209d07d7df45f9b7ca6eebfcbc9443de94e Mon Sep 17 00:00:00 2001
From: termie <github@anarkystic.com>
Date: Tue, 22 Feb 2011 17:10:34 -0800
Subject: don't make a syslog handler if we didn't ask for one

---
 nova/log.py | 5 +++--
 1 file 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:
-- 
cgit