openstack/deb-python-oslo.service
Code Issues Proposed changes

rpc, notifier: remove deprecated modules

Browse Source 
Let's remove that altogether now that everybody migrated to oslo.messaging.

Change-Id: I7ac0dba821601c5d6cb61b40951c9692782d88be
This commit is contained in:
Julien Danjou
2014-06-20 19:20:17 +02:00
parent c2a6946894
commit 0586521d34
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openstack/common/service.py
View File

@@ -39,13 +39,11 @@ from oslo.config import cfg
from openstack.common import eventlet_backdoor from openstack.common import eventlet_backdoor
from openstack.common.gettextutils import _LE, _LI, _LW from openstack.common.gettextutils import _LE, _LI, _LW
from openstack.common import importutils
from openstack.common import log as logging from openstack.common import log as logging
from openstack.common import systemd from openstack.common import systemd
from openstack.common import threadgroup from openstack.common import threadgroup
rpc = importutils.try_import('openstack.common.rpc')
CONF = cfg.CONF CONF = cfg.CONF
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@@ -180,12 +178,6 @@ class ServiceLauncher(Launcher):
status = exc.code status = exc.code
finally: finally:
self.stop() self.stop()
if rpc:
try:
rpc.cleanup()
except Exception:
# We're shutting down, so it doesn't matter at this point.
LOG.exception(_LE('Exception during rpc cleanup.'))
return status, signo return status, signo

4
tests/unit/test_service.py
View File

@@ -38,7 +38,6 @@ from six.moves import mox
from openstack.common import eventlet_backdoor from openstack.common import eventlet_backdoor
from openstack.common.fixture import config from openstack.common.fixture import config
from openstack.common import log as logging from openstack.common import log as logging
from openstack.common.notifier import api as notifier_api
from openstack.common import service from openstack.common import service
@@ -81,12 +80,9 @@ class ServiceTestBase(test_base.BaseTestCase):
def setUp(self): def setUp(self):
super(ServiceTestBase, self).setUp() super(ServiceTestBase, self).setUp()
self.CONF = self.useFixture(config.Config()).conf self.CONF = self.useFixture(config.Config()).conf
# FIXME(markmc): Ugly hack to workaround bug #1073732
self.CONF.unregister_opts(notifier_api.notifier_opts)
# NOTE(markmc): ConfigOpts.log_opt_values() uses CONF.config-file # NOTE(markmc): ConfigOpts.log_opt_values() uses CONF.config-file
self.CONF(args=[], default_config_files=[]) self.CONF(args=[], default_config_files=[])
self.addCleanup(self.CONF.reset) self.addCleanup(self.CONF.reset)
self.addCleanup(self.CONF.register_opts, notifier_api.notifier_opts)
self.addCleanup(self._reap_pid) self.addCleanup(self._reap_pid)
def _reap_pid(self): def _reap_pid(self):