Merge "Bug 884863: nova logs everything to syslog twice"

2011-11-03 03:07:56 +00:00 · 2011-11-03 03:07:56 +00:00 · 4fb1eda581
commit 4fb1eda581
parent e3ac202c85 a807c57f5b
1 changed files with 3 additions and 2 deletions
--- a/nova/log.py
+++ b/nova/log.py
@ -249,11 +249,12 @@ class NovaRootLogger(NovaLogger):
    def setup_from_flags(self):
        """Setup logger from flags."""
        global _filelog
+        if self.syslog:
+            self.removeHandler(self.syslog)
+            self.syslog = None
        if FLAGS.use_syslog:
            self.syslog = SysLogHandler(address='/dev/log')
            self.addHandler(self.syslog)
-        elif self.syslog:
-            self.removeHandler(self.syslog)
        logpath = _get_log_file_path()
        if logpath:
            self.removeHandler(self.streamlog)