diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-02 03:10:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-02 03:10:15 +0000 |
| commit | 3b4b003aeb52a0e6676ad661a08ea2b0028c65e3 (patch) | |
| tree | 82faee9d45890f27692878de8e45109e43ae6f3b /nova/openstack | |
| parent | 5155ac4252073c23ad50bbe26c8489350f3170d5 (diff) | |
| parent | 8ca04fc9a1bea39bc19543d2aca554d6fc30cb13 (diff) | |
| download | nova-3b4b003aeb52a0e6676ad661a08ea2b0028c65e3.tar.gz nova-3b4b003aeb52a0e6676ad661a08ea2b0028c65e3.tar.xz nova-3b4b003aeb52a0e6676ad661a08ea2b0028c65e3.zip | |
Merge "sync oslo log updates"
Diffstat (limited to 'nova/openstack')
| -rw-r--r-- | nova/openstack/common/log.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/nova/openstack/common/log.py b/nova/openstack/common/log.py index 3ee3027fc..dfad9919f 100644 --- a/nova/openstack/common/log.py +++ b/nova/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): |