Remove deprecated log-format option

Removes option marked as deprecated in Kilo and cleans up handler definition
to only use ContextFormatter

Change-Id: I09d7dcd0aeb91c2268365a90c491d46b979a49f1
This commit is contained in:
Ronald Bradford
2016-01-05 19:32:35 +00:00
parent 185c10a36b
commit b0aff1af5d
3 changed files with 8 additions and 35 deletions

View File

@@ -828,7 +828,6 @@ class LogConfigOptsTestCase(BaseTestCase):
self.assertTrue('debug' in f.getvalue())
self.assertTrue('verbose' in f.getvalue())
self.assertTrue('log-config' in f.getvalue())
self.assertTrue('log-format' in f.getvalue())
self.assertTrue('watch-log-file' in f.getvalue())
def test_debug_verbose(self):
@@ -843,7 +842,6 @@ class LogConfigOptsTestCase(BaseTestCase):
self.assertIsNone(self.CONF.log_config_append)
self.assertIsNone(self.CONF.log_file)
self.assertIsNone(self.CONF.log_dir)
self.assertIsNone(self.CONF.log_format)
self.assertEqual(self.CONF.log_date_format,
_options._DEFAULT_LOG_DATE_FORMAT)
@@ -899,14 +897,6 @@ class LogConfigOptsTestCase(BaseTestCase):
self.CONF(['--logdir', logdir])
self.assertEqual(self.CONF.log_dir, logdir)
def test_log_format_overrides_formatter(self):
self.CONF(['--log-format', '[Any format]'])
log._setup_logging_from_conf(self.CONF, 'test', 'test')
logger = log._loggers[None].logger
for handler in logger.handlers:
formatter = handler.formatter
self.assertTrue(isinstance(formatter, logging.Formatter))
def test_default_formatter(self):
log._setup_logging_from_conf(self.CONF, 'test', 'test')
logger = log._loggers[None].logger