summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavanum Srinivas <dims@linux.vnet.ibm.com>2013-03-10 21:10:52 -0400
committerDavanum Srinivas <dims@linux.vnet.ibm.com>2013-03-10 21:12:14 -0400
commit3e71cc4c8c7e08784f44c2e337a585e562b93ec5 (patch)
treed1d6d1031b4e4c478dcabb044ac90fdf3f2ba3f9
parent622f79311787c8a0b02d4999ada66810a97246e0 (diff)
downloadoslo-3e71cc4c8c7e08784f44c2e337a585e562b93ec5.tar.gz
oslo-3e71cc4c8c7e08784f44c2e337a585e562b93ec5.tar.xz
oslo-3e71cc4c8c7e08784f44c2e337a585e562b93ec5.zip
Unignore log_format option
Allow log_format option to be settable by the operator, as per configure-logging documentation. Thanks to Marcus Furlong. Fixes LP: #1124716 Change-Id: I15d39b3162643c22ff6c905ecbb2efa06e2d882f
-rw-r--r--openstack/common/log.py3
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)