diff options
author | Mehdi Abaakouk <mehdi.abaakouk@enovance.com> | 2014-04-29 10:54:43 +0200 |
---|---|---|
committer | Mehdi Abaakouk <mehdi.abaakouk@enovance.com> | 2014-04-30 14:42:25 +0200 |
commit | c929bf36fd805b3581727211370134767516e1bd (patch) | |
tree | ee67c6a9a7adcb25827b53b6db981e2beff85a5b /ceilometer/service.py | |
parent | 1779020170ebcc0e9f8bad82ad3117f849a1a147 (diff) | |
download | ceilometer-c929bf36fd805b3581727211370134767516e1bd.tar.gz |
Initialize dispatcher manager in event endpoint
Dispatcher Manager is not a service, so moved it into the correct
namespace, this allows the event handler to initialize it correctly.
Closes-bug: #1314080
Change-Id: I02792eef2d49f1c6b15d144d97c8a4a280ca150f
Diffstat (limited to 'ceilometer/service.py')
-rw-r--r-- | ceilometer/service.py | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/ceilometer/service.py b/ceilometer/service.py index 5eed5e89..66df31b4 100644 --- a/ceilometer/service.py +++ b/ceilometer/service.py @@ -22,7 +22,6 @@ import socket import sys from oslo.config import cfg -from stevedore import named from ceilometer import messaging from ceilometer.openstack.common import gettextutils @@ -37,10 +36,6 @@ OPTS = [ help='Name of this node, which must be valid in an AMQP ' 'key. Can be an opaque identifier. For ZeroMQ only, must ' 'be a valid host name, FQDN, or IP address.'), - cfg.MultiStrOpt('dispatcher', - deprecated_group="collector", - default=['database'], - help='Dispatcher to process data.'), cfg.IntOpt('collector_workers', default=1, help='Number of workers for collector service. A single ' @@ -102,25 +97,6 @@ class WorkerException(Exception): """ -class DispatchedService(object): - - DISPATCHER_NAMESPACE = 'ceilometer.dispatcher' - - def start(self): - LOG.debug(_('loading dispatchers from %s'), - self.DISPATCHER_NAMESPACE) - self.dispatcher_manager = named.NamedExtensionManager( - namespace=self.DISPATCHER_NAMESPACE, - names=cfg.CONF.dispatcher, - invoke_on_load=True, - invoke_args=[cfg.CONF]) - 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): workers = (cfg.CONF.get('%s_workers' % name) or utils.cpu_count()) |