summaryrefslogtreecommitdiffstats
path: root/openstack/common/log.py
diff options
context:
space:
mode:
Diffstat (limited to 'openstack/common/log.py')
-rw-r--r--openstack/common/log.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/openstack/common/log.py b/openstack/common/log.py
index 7d90975..b795ee4 100644
--- a/openstack/common/log.py
+++ b/openstack/common/log.py
@@ -325,16 +325,11 @@ def _create_logging_excepthook(product_name):
def setup(product_name):
"""Setup logging."""
- sys.excepthook = _create_logging_excepthook(product_name)
-
if CONF.log_config:
- try:
- logging.config.fileConfig(CONF.log_config)
- except Exception:
- traceback.print_exc()
- raise
+ logging.config.fileConfig(CONF.log_config)
else:
_setup_logging_from_conf(product_name)
+ sys.excepthook = _create_logging_excepthook(product_name)
def set_defaults(logging_context_format_string):