summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorDavid Ripton <dripton@redhat.com>2012-10-15 13:42:32 -0400
committerMark McLoughlin <markmc@redhat.com>2012-10-31 22:20:10 +0000
commit4d58dccfd58a01724a64415ff567abf359b48e1a (patch)
tree8f8eec4f36f4b2a6b4e1a302c5b0a64d29fd8e59 /openstack
parentae6f54dba69449eb1c231de162c12711bd2ab528 (diff)
downloadoslo-4d58dccfd58a01724a64415ff567abf359b48e1a.tar.gz
oslo-4d58dccfd58a01724a64415ff567abf359b48e1a.tar.xz
oslo-4d58dccfd58a01724a64415ff567abf359b48e1a.zip
Log CONF from ProcessLauncher.wait, like ServiceLauncher
Fixes bug #1050380 In the unit tests, we need to call CONF so that the config-file option referenced by log_opt_values() is registered. We also need unregister the default_publisher_id option to workaround bug #107372. Change-Id: Icc63237ddf97aaa730c0484974ec05a3080f8f04
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/service.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/openstack/common/service.py b/openstack/common/service.py
index 05060ca..002d478 100644
--- a/openstack/common/service.py
+++ b/openstack/common/service.py
@@ -275,6 +275,10 @@ class ProcessLauncher(object):
def wait(self):
"""Loop waiting on children to die and respawning as necessary"""
+
+ LOG.debug(_('Full set of CONF:'))
+ CONF.log_opt_values(LOG, std_logging.DEBUG)
+
while self.running:
wrap = self._wait_child()
if not wrap: