summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2011-08-28 19:23:31 -0700
committerChris Behrens <cbehrens@codestud.com>2011-08-28 19:23:31 -0700
commit4c2e9ae35b22e7ef2e3fdd20ed72bac115510ada (patch)
tree0c625ae46798d9108b5f83eed2cffc3a69e95471
parent6fbb35d596f670d6dcdda2486a12fc09ef9be853 (diff)
carrot consumer thread fix
-rw-r--r--nova/rpc/impl_carrot.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/rpc/impl_carrot.py b/nova/rpc/impl_carrot.py
index 07af0a116..d0e6f8269 100644
--- a/nova/rpc/impl_carrot.py
+++ b/nova/rpc/impl_carrot.py
@@ -118,13 +118,13 @@ class Connection(carrot_connection.BrokerConnection):
consumer_set.wait()
except greenlet.GreenletExit:
return
- if not self._rpc_consumer_thread:
+ if self._rpc_consumer_thread is None:
self._rpc_consumer_thread = eventlet.spawn(_consumer_thread)
return self._rpc_consumer_thread
def cancel_consumer_thread(self):
"""Cancel a consumer thread"""
- if self._rpc_consumer_thread:
+ if self._rpc_consumer_thread is not None:
self._rpc_consumer_thread.kill()
try:
self._rpc_consumer_thread.wait()