summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-03-12 17:10:51 +0000
committerGerrit Code Review <review@openstack.org>2013-03-12 17:10:51 +0000
commit553f6dcf8f9592482a0c55abcaec3c81b42558a7 (patch)
tree439ffa157d0296ab19c811886e53f6e6c073eecb /openstack
parent60842f6a02cf4c078a2f1971444efd9f97ead991 (diff)
parent9fe688a412d910e29fdf97fd0f97a7f815db6c8f (diff)
downloadoslo-553f6dcf8f9592482a0c55abcaec3c81b42558a7.tar.gz
oslo-553f6dcf8f9592482a0c55abcaec3c81b42558a7.tar.xz
oslo-553f6dcf8f9592482a0c55abcaec3c81b42558a7.zip
Merge "Initialize root logger in _setup_logging_from_conf()"
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/log.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/openstack/common/log.py b/openstack/common/log.py
index 4411331..59df758 100644
--- a/openstack/common/log.py
+++ b/openstack/common/log.py
@@ -328,7 +328,7 @@ def setup(product_name):
if CONF.log_config:
logging.config.fileConfig(CONF.log_config)
else:
- _setup_logging_from_conf(product_name)
+ _setup_logging_from_conf()
sys.excepthook = _create_logging_excepthook(product_name)
@@ -362,8 +362,8 @@ def _find_facility_from_conf():
return facility
-def _setup_logging_from_conf(product_name):
- log_root = getLogger(product_name).logger
+def _setup_logging_from_conf():
+ log_root = getLogger(None).logger
for handler in log_root.handlers:
log_root.removeHandler(handler)