diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-02-07 03:17:42 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-02-07 03:17:42 +0000 |
commit | 9c20b21cb282769fe65eaaf202ec5854a372cec2 (patch) | |
tree | dbe1bfde7da93a57d31d1d768e419b670f7b3235 | |
parent | bea9341b87e2687c3aa80491b96d4e51b66e1577 (diff) | |
parent | 4d8e122878b7af1865ad6dbce05e59a7701978a2 (diff) | |
download | oslo-log-9c20b21cb282769fe65eaaf202ec5854a372cec2.tar.gz |
Merge "Remove 'verbose' option (again)"
-rw-r--r-- | oslo_log/_options.py | 6 | ||||
-rw-r--r-- | oslo_log/log.py | 20 | ||||
-rw-r--r-- | oslo_log/tests/unit/test_log.py | 28 | ||||
-rw-r--r-- | releasenotes/notes/remove-verbose-option-d0d1381e182d1be1.yaml | 3 |
4 files changed, 17 insertions, 40 deletions
diff --git a/oslo_log/_options.py b/oslo_log/_options.py index 8b10384..e09238a 100644 --- a/oslo_log/_options.py +++ b/oslo_log/_options.py @@ -37,12 +37,6 @@ 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 = [ diff --git a/oslo_log/log.py b/oslo_log/log.py index 80e86f5..87448a6 100644 --- a/oslo_log/log.py +++ b/oslo_log/log.py @@ -232,10 +232,8 @@ 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, conf.verbose) + _refresh_root_level(conf.debug) if (None, 'log-config-append') in fresh: _load_log_config.old_time = 0 @@ -327,25 +325,19 @@ def _find_facility(facility): return getattr(syslog, facility) -def _refresh_root_level(debug, verbose): +def _refresh_root_level(debug): """Set the level of the root logger. - 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. + If 'debug' is True, the level will be DEBUG. Otherwise the level will be + INFO. :param debug - :param verbose """ log_root = getLogger(None).logger if debug: log_root.setLevel(logging.DEBUG) - elif verbose: - log_root.setLevel(logging.INFO) else: - log_root.setLevel(logging.WARNING) + log_root.setLevel(logging.INFO) def _setup_logging_from_conf(conf, project, version): @@ -396,7 +388,7 @@ def _setup_logging_from_conf(conf, project, version): version=version, datefmt=datefmt, config=conf)) - _refresh_root_level(conf.debug, conf.verbose) + _refresh_root_level(conf.debug) for pair in conf.default_log_levels: mod, _sep, level_name = pair.partition('=') diff --git a/oslo_log/tests/unit/test_log.py b/oslo_log/tests/unit/test_log.py index 12f04bd..eeaa7c3 100644 --- a/oslo_log/tests/unit/test_log.py +++ b/oslo_log/tests/unit/test_log.py @@ -107,13 +107,6 @@ 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' @@ -121,12 +114,12 @@ class CommonLoggerTestsMixIn(object): logger = logging.getLogger(logger_name) self.assertEqual(logging.DEBUG, logger.getEffectiveLevel()) - def test_will_not_be_verbose_if_verbose_flag_not_set(self): - self.config(verbose=False) - logger_name = 'test_is_not_verbose' + def test_will_be_info_if_debug_flag_not_set(self): + self.config(debug=False) + logger_name = 'test_is_not_debug' log.setup(self.CONF, logger_name) logger = logging.getLogger(logger_name) - self.assertEqual(logging.WARN, logger.getEffectiveLevel()) + self.assertEqual(logging.INFO, logger.getEffectiveLevel()) def test_no_logging_via_module(self): for func in ('critical', 'error', 'exception', 'warning', 'warn', @@ -309,8 +302,7 @@ class LogLevelTestCase(BaseTestCase): levels.append(warn_level + '=WARN') levels.append(other_level + '=7') levels.append(trace_level + '=TRACE') - self.config(default_log_levels=levels, - verbose=True) + self.config(default_log_levels=levels) log.setup(self.CONF, 'testing') self.log = log.getLogger(info_level) self.log_no_debug = log.getLogger(warn_level) @@ -1067,14 +1059,12 @@ class MutateTestCase(BaseTestCase): log_root = log.getLogger(None).logger log._setup_logging_from_conf(self.CONF, 'test', 'test') self.assertEqual(False, self.CONF.debug) - self.assertEqual(True, self.CONF.verbose) self.assertEqual(log.INFO, log_root.getEffectiveLevel()) shutil.copy(paths[1], paths[0]) self.CONF.mutate_config_files() self.assertEqual(True, self.CONF.debug) - self.assertEqual(True, self.CONF.verbose) self.assertEqual(log.DEBUG, log_root.getEffectiveLevel()) @mock.patch.object(logging.config, "fileConfig") @@ -1313,14 +1303,12 @@ class LogConfigOptsTestCase(BaseTestCase): f = six.StringIO() self.CONF([]) self.CONF.print_help(file=f) - for option in ['debug', 'verbose', 'log-config', 'watch-log-file']: + for option in ['debug', 'log-config', 'watch-log-file']: self.assertIn(option, f.getvalue()) - def test_debug_verbose(self): - self.CONF(['--debug', '--verbose']) - + def test_debug(self): + self.CONF(['--debug']) self.assertEqual(True, self.CONF.debug) - self.assertEqual(True, self.CONF.verbose) def test_logging_opts(self): self.CONF([]) diff --git a/releasenotes/notes/remove-verbose-option-d0d1381e182d1be1.yaml b/releasenotes/notes/remove-verbose-option-d0d1381e182d1be1.yaml new file mode 100644 index 0000000..32e2306 --- /dev/null +++ b/releasenotes/notes/remove-verbose-option-d0d1381e182d1be1.yaml @@ -0,0 +1,3 @@ +--- +upgrade: + - The deprecated 'verbose' option has been removed. |