Revert "Remove 'verbose' option"
This reverts commit 7c671ea77f
.
This one is causing to many issues in consuming projects
to just yet remove (even though its been deprecated for two
cycles).
Change-Id: I5486b0fe1c55f41aed5fb209214adeaca03a64fb
This commit is contained in:
parent
07c3c287f7
commit
ed582b1087
|
@ -37,6 +37,12 @@ common_cli_opts = [
|
|||
mutable=True,
|
||||
help='If set to true, the logging level will be set to '
|
||||
'DEBUG instead of the default INFO level.'),
|
||||
cfg.BoolOpt('verbose',
|
||||
short='v',
|
||||
default=True,
|
||||
help='If set to false, the logging level will be set to '
|
||||
'WARNING instead of the default INFO level.',
|
||||
deprecated_for_removal=True),
|
||||
]
|
||||
|
||||
logging_cli_opts = [
|
||||
|
|
|
@ -222,8 +222,10 @@ def _load_log_config(log_config_append):
|
|||
def _mutate_hook(conf, fresh):
|
||||
"""Reconfigures oslo.log according to the mutated options."""
|
||||
|
||||
# verbose is deprecated, so I didn't make it mutable, so there's no need to
|
||||
# test for it here.
|
||||
if (None, 'debug') in fresh:
|
||||
_refresh_root_level(conf.debug)
|
||||
_refresh_root_level(conf.debug, conf.verbose)
|
||||
|
||||
|
||||
def register_options(conf):
|
||||
|
@ -310,19 +312,25 @@ def _find_facility(facility):
|
|||
return getattr(syslog, facility)
|
||||
|
||||
|
||||
def _refresh_root_level(debug):
|
||||
def _refresh_root_level(debug, verbose):
|
||||
"""Set the level of the root logger.
|
||||
|
||||
If 'debug' is True, the level will be DEBUG. Otherwise the level will be
|
||||
WARNING.
|
||||
If 'debug' is True, the level will be DEBUG. Otherwise we look at 'verbose'
|
||||
- if that is True, the level will be INFO. If neither are set, the level
|
||||
will be WARNING.
|
||||
|
||||
Note the 'verbose' option is deprecated.
|
||||
|
||||
:param debug
|
||||
:param verbose
|
||||
"""
|
||||
log_root = getLogger(None).logger
|
||||
if debug:
|
||||
log_root.setLevel(logging.DEBUG)
|
||||
else:
|
||||
elif verbose:
|
||||
log_root.setLevel(logging.INFO)
|
||||
else:
|
||||
log_root.setLevel(logging.WARNING)
|
||||
|
||||
|
||||
def _setup_logging_from_conf(conf, project, version):
|
||||
|
@ -373,7 +381,7 @@ def _setup_logging_from_conf(conf, project, version):
|
|||
version=version,
|
||||
datefmt=datefmt,
|
||||
config=conf))
|
||||
_refresh_root_level(conf.debug)
|
||||
_refresh_root_level(conf.debug, conf.verbose)
|
||||
|
||||
for pair in conf.default_log_levels:
|
||||
mod, _sep, level_name = pair.partition('=')
|
||||
|
|
|
@ -90,6 +90,13 @@ class CommonLoggerTestsMixIn(object):
|
|||
self.log.info("foo", context=_fake_context())
|
||||
self.assertTrue(True) # didn't raise exception
|
||||
|
||||
def test_will_be_verbose_if_verbose_flag_set(self):
|
||||
self.config(verbose=True)
|
||||
logger_name = 'test_is_verbose'
|
||||
log.setup(self.CONF, logger_name)
|
||||
logger = logging.getLogger(logger_name)
|
||||
self.assertEqual(logging.INFO, logger.getEffectiveLevel())
|
||||
|
||||
def test_will_be_debug_if_debug_flag_set(self):
|
||||
self.config(debug=True)
|
||||
logger_name = 'test_is_debug'
|
||||
|
@ -97,12 +104,12 @@ class CommonLoggerTestsMixIn(object):
|
|||
logger = logging.getLogger(logger_name)
|
||||
self.assertEqual(logging.DEBUG, logger.getEffectiveLevel())
|
||||
|
||||
def test_will_be_info_if_debug_flag_not_set(self):
|
||||
self.config(debug=False)
|
||||
logger_name = 'test_is_not_debug'
|
||||
def test_will_not_be_verbose_if_verbose_flag_not_set(self):
|
||||
self.config(verbose=False)
|
||||
logger_name = 'test_is_not_verbose'
|
||||
log.setup(self.CONF, logger_name)
|
||||
logger = logging.getLogger(logger_name)
|
||||
self.assertEqual(logging.INFO, logger.getEffectiveLevel())
|
||||
self.assertEqual(logging.WARN, logger.getEffectiveLevel())
|
||||
|
||||
def test_no_logging_via_module(self):
|
||||
for func in ('critical', 'error', 'exception', 'warning', 'warn',
|
||||
|
@ -265,7 +272,8 @@ class LogLevelTestCase(BaseTestCase):
|
|||
levels.append(warn_level + '=WARN')
|
||||
levels.append(other_level + '=7')
|
||||
levels.append(trace_level + '=TRACE')
|
||||
self.config(default_log_levels=levels)
|
||||
self.config(default_log_levels=levels,
|
||||
verbose=True)
|
||||
log.setup(self.CONF, 'testing')
|
||||
self.log = log.getLogger(info_level)
|
||||
self.log_no_debug = log.getLogger(warn_level)
|
||||
|
@ -865,12 +873,15 @@ class ConfigTestCase(test_base.BaseTestCase):
|
|||
|
||||
log._setup_logging_from_conf(conf, 'test', 'test')
|
||||
self.assertEqual(conf.debug, False)
|
||||
|
||||
self.assertEqual(conf.verbose, True)
|
||||
self.assertEqual(log.INFO, log_root.getEffectiveLevel())
|
||||
|
||||
shutil.copy(paths[1], paths[0])
|
||||
conf.mutate_config_files()
|
||||
|
||||
self.assertEqual(conf.debug, True)
|
||||
self.assertEqual(conf.verbose, True)
|
||||
self.assertEqual(log.DEBUG, log_root.getEffectiveLevel())
|
||||
|
||||
|
||||
|
@ -883,12 +894,14 @@ class LogConfigOptsTestCase(BaseTestCase):
|
|||
f = six.StringIO()
|
||||
self.CONF([])
|
||||
self.CONF.print_help(file=f)
|
||||
for option in ['debug', 'log-config', 'watch-log-file']:
|
||||
for option in ['debug', 'verbose', 'log-config', 'watch-log-file']:
|
||||
self.assertIn(option, f.getvalue())
|
||||
|
||||
def test_debug(self):
|
||||
self.CONF(['--debug'])
|
||||
def test_debug_verbose(self):
|
||||
self.CONF(['--debug', '--verbose'])
|
||||
|
||||
self.assertEqual(self.CONF.debug, True)
|
||||
self.assertEqual(self.CONF.verbose, True)
|
||||
|
||||
def test_logging_opts(self):
|
||||
self.CONF([])
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
---
|
||||
upgrade:
|
||||
- The deprecated 'verbose' option has been removed.
|
Loading…
Reference in New Issue