openstack/oslo.log
Code Issues Proposed changes

Fix package name for PublishErrorsHandler

Browse Source 
We missed a spot when we switched from oslo.messaging
to oslo_messaging

Change-Id: Icfc6747eb059b6e8f694b2c8e812472551281636
This commit is contained in:
Davanum Srinivas
2015-08-13 08:43:12 -04:00
committed by Davanum Srinivas (dims)
parent 6a7932f9d1
commit a0e50f8ee3
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oslo_log/log.py
View File

@@ -326,7 +326,7 @@ def _setup_logging_from_conf(conf, project, version):
if conf.publish_errors:
handler = importutils.import_object(
"oslo.messaging.notify.log_handler.PublishErrorsHandler",
"oslo_messaging.notify.log_handler.PublishErrorsHandler",
logging.ERROR)
log_root.addHandler(handler)

18
oslo_log/tests/unit/test_log.py
View File

@@ -709,6 +709,24 @@ class LogConfigOptsTestCase(BaseTestCase):
self.assertIsInstance(logger.handlers[0],
logging.handlers.WatchedFileHandler)
def test_log_publish_errors_handlers(self):
fake_handler = mock.MagicMock()
with mock.patch('oslo_utils.importutils.import_object',
return_value=fake_handler) as mock_import:
log_dir = tempfile.mkdtemp()
self.CONF(['--log-dir', log_dir])
self.CONF.set_default('use_stderr', False)
self.CONF.set_default('publish_errors', True)
log._setup_logging_from_conf(self.CONF, 'test', 'test')
logger = log._loggers[None].logger
self.assertEqual(2, len(logger.handlers))
self.assertIsInstance(logger.handlers[0],
logging.handlers.WatchedFileHandler)
self.assertEqual(logger.handlers[1], fake_handler)
mock_import.assert_called_once_with(
'oslo_messaging.notify.log_handler.PublishErrorsHandler',
logging.ERROR)
def test_logfile_deprecated(self):
logfile = '/some/other/path/foo-bar.log'
self.CONF(['--logfile', logfile])