Merge "Allow nova and others to override some logging defaults"

2 files changed, 13 insertions, 0 deletions

diff --git a/openstack/common/cfg.py b/openstack/common/cfg.py
index acef6fb..99d4aa2 100644
--- a/openstack/common/cfg.py
+++ b/openstack/common/cfg.py
@@ -480,6 +480,13 @@ def _is_opt_registered(opts, opt):
         return False
 
 
+def set_defaults(opts, **kwargs):
+    for opt in opts:
+        if opt.dest in kwargs:
+            opt.default = kwargs[opt.dest]
+            break
+
+
 class Opt(object):
 
     """Base class for all configuration options.
diff --git a/openstack/common/log.py b/openstack/common/log.py
index 8469fe8..707a10a 100644
--- a/openstack/common/log.py
+++ b/openstack/common/log.py
@@ -289,6 +289,12 @@ def setup(product_name):
         _setup_logging_from_conf(product_name)
 
 
+def set_defaults(logging_context_format_string):
+    cfg.set_defaults(log_opts,
+                     logging_context_format_string=
+                     logging_context_format_string)
+
+
 def _find_facility_from_conf():
     facility_names = logging.handlers.SysLogHandler.facility_names
     facility = getattr(logging.handlers.SysLogHandler,