diff options
| author | termie <github@anarkystic.com> | 2011-02-23 23:35:46 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-02-23 23:35:46 +0000 |
| commit | 2577aad970dde9c172eddf82c2f7ce129770ad49 (patch) | |
| tree | 2930621bfe3cdc82841e53b9ceece1dc2e1a8970 | |
| parent | cd301d67506bcb6d67d921492435e9d7d56aafb1 (diff) | |
| parent | 5b2ec209d07d7df45f9b7ca6eebfcbc9443de94e (diff) | |
Prevent logging.setup() from generating a syslog handler if we didn't request one (breaks on mac)
| -rw-r--r-- | nova/log.py | 5 |
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: |