openstack
/
magnum
Code Issues Proposed changes

Merge "oslo_messaging requires stop() before wait()"

This commit is contained in:
Jenkins 2016-01-06 05:48:45 +00:00 committed by Gerrit Code Review
parent 7ec7d019db 27b2868c08
commit c3b84bff88
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
magnum/common/rpc_service.py
View File

@ -76,8 +76,11 @@ class Service(service.Service):
servicegroup.setup(CONF, self.binary, self.tg)
self._server.start()
def wait(self):
self._server.wait()
def stop(self):
if self._server:
self._server.stop()
self._server.wait()
super(Service, self).stop()
@classmethod
def create(cls, topic, server, handlers, binary):