openstack/oslo.log
Code Issues Proposed changes

Make logging_context_format_string optional in log.set_defaults

Browse Source 
Instead of supporting setting logging_context_format_string to None,
which will break things. Support not specifying
logging_context_format_string in log.set_defaults so projects can set
the default_log_level

Change-Id: I932d5b2148a57c5b59ab3f071e53c87ef43b6a6e
This commit is contained in:
Joe Gordon
2014-07-15 17:13:44 +02:00
parent b36d822fee
commit 08dee8ebf2
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
openstack/common/log.py
View File

@@ -410,18 +410,20 @@ def setup(product_name, version='unknown'):
sys.excepthook = _create_logging_excepthook(product_name)
def set_defaults(logging_context_format_string,
def set_defaults(logging_context_format_string=None,
default_log_levels=None):
# Just in case the caller is not setting the
# default_log_level. This is insurance because
# we introduced the default_log_level parameter
# later in a backwards in-compatible change
if default_log_levels is None:
default_log_levels = DEFAULT_LOG_LEVELS
cfg.set_defaults(
log_opts,
logging_context_format_string=logging_context_format_string,
default_log_levels=default_log_levels)
if default_log_levels is not None:
cfg.set_defaults(
log_opts,
default_log_levels=default_log_levels)
if logging_context_format_string is not None:
cfg.set_defaults(
log_opts,
logging_context_format_string=logging_context_format_string)
def _find_facility_from_conf():

9
tests/unit/test_log.py
View File

@@ -541,11 +541,6 @@ class SetDefaultsTestCase(test_base.BaseTestCase):
for opt in log.log_opts:
opt.default = self._orig_defaults[opt.dest]
def test_default_to_none(self):
log.set_defaults(logging_context_format_string=None)
self.conf([])
self.assertIsNone(self.conf.logging_context_format_string)
def test_default_log_level_to_none(self):
log.set_defaults(logging_context_format_string=None,
default_log_levels=None)
@@ -561,10 +556,10 @@ class SetDefaultsTestCase(test_base.BaseTestCase):
self.assertEqual(self.conf.logging_context_format_string, my_default)
def test_change_default_log_level(self):
log.set_defaults(logging_context_format_string=None,
default_log_levels=['foo=bar'])
log.set_defaults(default_log_levels=['foo=bar'])
self.conf([])
self.assertEqual(['foo=bar'], self.conf.default_log_levels)
self.assertIsNotNone(self.conf.logging_context_format_string)
class LogConfigOptsTestCase(test_base.BaseTestCase):