summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-11-17 14:32:07 +0000
committerGerrit Code Review <review@openstack.org>2014-11-17 14:32:07 +0000
commitfc18c13a9abb0b2ab77e2bfac31018b94b0a516f (patch)
treef47a33b3494f5adb8d2ee8bdd1cd0bd456d398d5
parent6b6f2600bf29debd314c21f7b48af887f6c08c96 (diff)
parent63d934b986d5ca371fe63c6dba0b4a0a2f0bed25 (diff)
downloadceilometer-fc18c13a9abb0b2ab77e2bfac31018b94b0a516f.tar.gz
Merge "ensure dispatcher service is configured before rpc" into stable/icehouse
-rw-r--r--ceilometer/service.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ceilometer/service.py b/ceilometer/service.py
index 48f18075..b23572b7 100644
--- a/ceilometer/service.py
+++ b/ceilometer/service.py
@@ -109,7 +109,6 @@ class DispatchedService(object):
DISPATCHER_NAMESPACE = 'ceilometer.dispatcher'
def start(self):
- super(DispatchedService, self).start()
LOG.debug(_('loading dispatchers from %s'),
self.DISPATCHER_NAMESPACE)
self.dispatcher_manager = named.NamedExtensionManager(
@@ -120,6 +119,8 @@ class DispatchedService(object):
if not list(self.dispatcher_manager):
LOG.warning(_('Failed to load any dispatchers for %s'),
self.DISPATCHER_NAMESPACE)
+ # ensure dispatcher is configured before starting other services
+ super(DispatchedService, self).start()
def get_workers(name):