diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-12 15:24:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-12 15:24:44 +0000 |
| commit | ef884cd520da319939bc57ad2032cfb0c6e8b4e5 (patch) | |
| tree | e5eda538e75cc93250287deedd24ae01d738c4e0 | |
| parent | 8589eb84287c99c25f0e28a3a8c3ff40f4f99f4c (diff) | |
| parent | 3e71cc4c8c7e08784f44c2e337a585e562b93ec5 (diff) | |
| download | oslo-ef884cd520da319939bc57ad2032cfb0c6e8b4e5.tar.gz oslo-ef884cd520da319939bc57ad2032cfb0c6e8b4e5.tar.xz oslo-ef884cd520da319939bc57ad2032cfb0c6e8b4e5.zip | |
Merge "Unignore log_format option"
| -rw-r--r-- | openstack/common/log.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openstack/common/log.py b/openstack/common/log.py index b795ee4..c1dde7f 100644 --- a/openstack/common/log.py +++ b/openstack/common/log.py @@ -401,7 +401,8 @@ def _setup_logging_from_conf(product_name): if CONF.log_format: handler.setFormatter(logging.Formatter(fmt=CONF.log_format, datefmt=datefmt)) - handler.setFormatter(LegacyFormatter(datefmt=datefmt)) + else: + handler.setFormatter(LegacyFormatter(datefmt=datefmt)) if CONF.debug: log_root.setLevel(logging.DEBUG) |