x/python-ganttclient
Code Issues Proposed changes

clean up location of method

Browse Source
This commit is contained in:
Vishvananda Ishaya
2011-02-20 23:45:43 -08:00
parent 19c2952d46
commit af334e5739
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
nova/log.py
View File

@@ -117,21 +117,6 @@ def _get_binary_name():
return os.path.basename(inspect.stack()[-1][1]) 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): def _get_log_file_path(binary=None):
if FLAGS.logfile: if FLAGS.logfile:
return FLAGS.logfile return FLAGS.logfile
@@ -162,9 +147,24 @@ class NovaLogger(logging.Logger):
if flags.FlagValues.initialized: if flags.FlagValues.initialized:
self.setup_from_flags() 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): def setup_from_flags(self):
"""Setup logger from flags""" """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.setLevel(globals()[level_name])
self.initialized = True self.initialized = True
if not logging.root.initialized: if not logging.root.initialized:
@@ -302,7 +302,7 @@ if not isinstance(logging.root, NovaRootLogger):
logging.root = NovaRootLogger("nova") logging.root = NovaRootLogger("nova")
NovaLogger.root = logging.root NovaLogger.root = logging.root
NovaLogger.manager.root = logging.root NovaLogger.manager.root = logging.root
root=logging.root root = logging.root
def audit(msg, *args, **kwargs): def audit(msg, *args, **kwargs):