oslo.service triggers shutdown

As oslo.service now triggers shutdown, we should remove
our stop call as this triggers service shutdown code to be
executed twice in a row.

Change-Id: I262d4b9aa35b420c9b5f5131c414f7eb4f4fec1a
This commit is contained in:
Kiall Mac Innes 2015-06-30 13:59:45 +01:00
parent 77783cb377
commit dec1d9ae09

View File

@ -132,6 +132,8 @@ class RPCService(object):
e.start()
def stop(self):
LOG.debug("Stopping RPC server on topic '%s'" % self._rpc_topic)
for e in self._rpc_endpoints:
if e != self and hasattr(e, 'stop'):
e.stop()
@ -393,5 +395,5 @@ def wait():
try:
_launcher.wait()
except KeyboardInterrupt:
_launcher.stop()
LOG.debug('Caught KeyboardInterrupt, shutting down now')
rpc.cleanup()