Merge "Ability to customize default_log_levels for each project"

2 files changed, 30 insertions, 14 deletions

diff --git a/openstack/common/log.py b/openstack/common/log.py
index 4f2c86c8..3b1b557f 100644
--- a/openstack/common/log.py
+++ b/openstack/common/log.py
@@ -120,6 +120,12 @@ generic_log_opts = [
                 help='Log output to standard error.')
 ]
 
+DEFAULT_LOG_LEVELS = ['amqp=WARN', 'amqplib=WARN', 'boto=WARN',
+                      'qpid=WARN', 'sqlalchemy=WARN', 'suds=INFO',
+                      'oslo.messaging=INFO', 'iso8601=WARN',
+                      'requests.packages.urllib3.connectionpool=WARN',
+                      'urllib3.connectionpool=WARN']
+
 log_opts = [
     cfg.StrOpt('logging_context_format_string',
                default='%(asctime)s.%(msecs)03d %(process)d %(levelname)s '
@@ -138,18 +144,7 @@ log_opts = [
                '%(instance)s',
                help='Prefix each line of exception output with this format.'),
     cfg.ListOpt('default_log_levels',
-                default=[
-                    'amqp=WARN',
-                    'amqplib=WARN',
-                    'boto=WARN',
-                    'qpid=WARN',
-                    'sqlalchemy=WARN',
-                    'suds=INFO',
-                    'oslo.messaging=INFO',
-                    'iso8601=WARN',
-                    'requests.packages.urllib3.connectionpool=WARN',
-                    'urllib3.connectionpool=WARN'
-                ],
+                default=DEFAULT_LOG_LEVELS,
                 help='List of logger=LEVEL pairs.'),
     cfg.BoolOpt('publish_errors',
                 default=False,
@@ -415,9 +410,18 @@ 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,
+                 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)
+            log_opts,
+            logging_context_format_string=logging_context_format_string,
+            default_log_levels=default_log_levels)
 
 
 def _find_facility_from_conf():
diff --git a/tests/unit/test_log.py b/tests/unit/test_log.py
index d63a6b16..3fa3de65 100644
--- a/tests/unit/test_log.py
+++ b/tests/unit/test_log.py
@@ -538,6 +538,12 @@ class SetDefaultsTestCase(test_base.BaseTestCase):
         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)
+        self.conf([])
+        self.assertEqual(log.DEFAULT_LOG_LEVELS, self.conf.default_log_levels)
+
     def test_change_default(self):
         my_default = '%(asctime)s %(levelname)s %(name)s [%(request_id)s '\
                      '%(user_id)s %(project)s] %(instance)s'\
@@ -546,6 +552,12 @@ class SetDefaultsTestCase(test_base.BaseTestCase):
         self.conf([])
         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'])
+        self.conf([])
+        self.assertEqual(['foo=bar'], self.conf.default_log_levels)
+
 
 class LogConfigOptsTestCase(test_base.BaseTestCase):