summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-02-20 23:45:43 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2011-02-20 23:45:43 -0800
commit2792e42a9c7da390b3db0b59b7dff357c440d3e5 (patch)
tree33af725da3a29c30161112246f39169f134e4bd2
parenteaddb9ea529672549af28cab4aacd2f8243c62a3 (diff)
downloadnova-2792e42a9c7da390b3db0b59b7dff357c440d3e5.tar.gz
nova-2792e42a9c7da390b3db0b59b7dff357c440d3e5.tar.xz
nova-2792e42a9c7da390b3db0b59b7dff357c440d3e5.zip
clean up location of method
-rw-r--r--nova/log.py34
1 files changed, 17 insertions, 17 deletions
diff --git a/nova/log.py b/nova/log.py
index 0a863c921..57a550a0b 100644
--- a/nova/log.py
+++ b/nova/log.py
@@ -117,21 +117,6 @@ def _get_binary_name():
return os.path.basename(inspect.stack()[-1][1])
-def _get_level_from_flags(name):
- # if exactly "nova", or a child logger, honor the verbose flag
- if (name == "nova" or name.startswith("nova.")) and FLAGS.verbose:
- return 'DEBUG'
- for pair in FLAGS.default_log_levels:
- logger, _sep, level = pair.partition('=')
- # NOTE(todd): if we set a.b, we want a.b.c to have the same level
- # (but not a.bc, so we check the dot)
- if name == logger:
- return level
- if name.startswith(logger) and name[len(logger)] == '.':
- return level
- return 'INFO'
-
-
def _get_log_file_path(binary=None):
if FLAGS.logfile:
return FLAGS.logfile
@@ -162,9 +147,24 @@ class NovaLogger(logging.Logger):
if flags.FlagValues.initialized:
self.setup_from_flags()
+ @staticmethod
+ def _get_level_from_flags(name):
+ # if exactly "nova", or a child logger, honor the verbose flag
+ if (name == "nova" or name.startswith("nova.")) and FLAGS.verbose:
+ return 'DEBUG'
+ for pair in FLAGS.default_log_levels:
+ logger, _sep, level = pair.partition('=')
+ # NOTE(todd): if we set a.b, we want a.b.c to have the same level
+ # (but not a.bc, so we check the dot)
+ if name == logger:
+ return level
+ if name.startswith(logger) and name[len(logger)] == '.':
+ return level
+ return 'INFO'
+
def setup_from_flags(self):
"""Setup logger from flags"""
- level_name = _get_level_from_flags(self.name)
+ level_name = self._get_level_from_flags(self.name)
self.setLevel(globals()[level_name])
self.initialized = True
if not logging.root.initialized:
@@ -302,7 +302,7 @@ if not isinstance(logging.root, NovaRootLogger):
logging.root = NovaRootLogger("nova")
NovaLogger.root = logging.root
NovaLogger.manager.root = logging.root
-root=logging.root
+root = logging.root
def audit(msg, *args, **kwargs):