commit 1c6d9774362b8e164f70a2eba3c374b2b8d923ac
author Jenkins <jenkins@review.openstack.org> Fri Feb 19 04:23:38 2016 +0000
committer Gerrit Code Review <review@openstack.org> Fri Feb 19 04:23:39 2016 +0000
tree 4c3a5cb5a4511ee30fa3a153797b8057b4465d57
parent 58c3afb6fc4d1bbf5102b1f222543eae1d9309d2
parent e6f7c7d8d15997df029a37c285a4dc410918032b

Merge "Enable logging if log_config_append is None"

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index 5523fe2..cdeb916 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -1371,7 +1371,8 @@
             _CONF([], project='tempest')
 
         logging_cfg_path = "%s/logging.conf" % os.path.dirname(path)
-        if (not hasattr(_CONF, 'log_config_append') and
+        if ((not hasattr(_CONF, 'log_config_append') or
+            _CONF.log_config_append is None) and
             os.path.isfile(logging_cfg_path)):
             # if logging conf is in place we need to set log_config_append
             _CONF.log_config_append = logging_cfg_path