x/python-ganttclient
Code Issues Proposed changes

carrot consumer thread fix

Browse Source
This commit is contained in:
Chris Behrens
2011-08-28 19:23:31 -07:00
parent d6cce6e0e4
commit 821b61b386
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/rpc/impl_carrot.py
View File

@@ -118,13 +118,13 @@ class Connection(carrot_connection.BrokerConnection):
consumer_set.wait() consumer_set.wait()
except greenlet.GreenletExit: except greenlet.GreenletExit:
return return
if not self._rpc_consumer_thread: if self._rpc_consumer_thread is None:
self._rpc_consumer_thread = eventlet.spawn(_consumer_thread) self._rpc_consumer_thread = eventlet.spawn(_consumer_thread)
return self._rpc_consumer_thread return self._rpc_consumer_thread
def cancel_consumer_thread(self): def cancel_consumer_thread(self):
"""Cancel a consumer thread""" """Cancel a consumer thread"""
if self._rpc_consumer_thread: if self._rpc_consumer_thread is not None:
self._rpc_consumer_thread.kill() self._rpc_consumer_thread.kill()
try: try:
self._rpc_consumer_thread.wait() self._rpc_consumer_thread.wait()