Merge "Finally ack consumed message"

ttx · Jun 5, 2012 · be9bcd8 · be9bcd8
2 parents 2b9ff78 + d28f5bd
commit be9bcd8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/nova/rpc/impl_kombu.py b/nova/rpc/impl_kombu.py
@@ -139,9 +139,10 @@ def _callback(raw_message):
             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)