From 3e71cc4c8c7e08784f44c2e337a585e562b93ec5 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <dims@linux.vnet.ibm.com>
Date: Sun, 10 Mar 2013 21:10:52 -0400
Subject: 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
---
 openstack/common/log.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)
-- 
cgit