summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-06-05 13:58:53 +0000
committerGerrit Code Review <review@openstack.org>2012-06-05 13:58:53 +0000
commitbe9bcd8ea49e60c7637a44a1dfecbe421ff1c15c (patch)
tree7bfa3594a8ea629dff09428cbdb182142099b062 /nova
parent2b9ff78f2c006cc7ba1cfe7b3561beb17d08013e (diff)
parentd28f5bdaab5e620c6e4ece839526495bc632a2b4 (diff)
Merge "Finally ack consumed message"
Diffstat (limited to 'nova')
-rw-r--r--nova/rpc/impl_kombu.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/rpc/impl_kombu.py b/nova/rpc/impl_kombu.py
index 9058a4720..a9d887323 100644
--- a/nova/rpc/impl_kombu.py
+++ b/nova/rpc/impl_kombu.py
@@ -139,9 +139,10 @@ class ConsumerBase(object):
message = self.channel.message_to_python(raw_message)
try:
callback(message.payload)
- message.ack()
except Exception:
LOG.exception(_("Failed to process message... skipping it."))
+ finally:
+ message.ack()
self.queue.consume(*args, callback=_callback, **options)