summaryrefslogtreecommitdiffstats
path: root/nova/log.py
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-02-21 00:15:49 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2011-02-21 00:15:49 -0800
commit7eab72b30cad9708e976f60e121569972b835b61 (patch)
tree60b0ffcf3f8afb164b93f5f879c5239b19b61b79 /nova/log.py
parent2792e42a9c7da390b3db0b59b7dff357c440d3e5 (diff)
downloadnova-7eab72b30cad9708e976f60e121569972b835b61.tar.gz
nova-7eab72b30cad9708e976f60e121569972b835b61.tar.xz
nova-7eab72b30cad9708e976f60e121569972b835b61.zip
get rid of initialized flag
Diffstat (limited to 'nova/log.py')
-rw-r--r--nova/log.py16
1 files changed, 4 insertions, 12 deletions
diff --git a/nova/log.py b/nova/log.py
index 57a550a0b..8d240782d 100644
--- a/nova/log.py
+++ b/nova/log.py
@@ -143,9 +143,7 @@ class NovaLogger(logging.Logger):
"""
def __init__(self, name, level=NOTSET):
logging.Logger.__init__(self, name, level)
- self.initialized = False
- if flags.FlagValues.initialized:
- self.setup_from_flags()
+ self.setup_from_flags()
@staticmethod
def _get_level_from_flags(name):
@@ -166,15 +164,6 @@ class NovaLogger(logging.Logger):
"""Setup logger from flags"""
level_name = self._get_level_from_flags(self.name)
self.setLevel(globals()[level_name])
- self.initialized = True
- if not logging.root.initialized:
- logging.root.setup_from_flags()
-
- def isEnabledFor(self, level):
- """Reset level after flags have been loaded"""
- if not self.initialized and flags.FlagValues.initialized:
- self.setup_from_flags()
- return logging.Logger.isEnabledFor(self, level)
def _log(self, level, msg, args, exc_info=None, extra=None, context=None):
"""Extract context from any log call"""
@@ -304,6 +293,9 @@ if not isinstance(logging.root, NovaRootLogger):
NovaLogger.manager.root = logging.root
root = logging.root
+def reset():
+ root.setup_from_flags()
+
def audit(msg, *args, **kwargs):
"""Shortcut for logging to root log with sevrity 'AUDIT'."""