diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-14 17:11:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-14 17:11:10 +0000 |
| commit | ecdd50d4e00bf8b0607801e763cef4cb408e091f (patch) | |
| tree | b31a51a7c61ea1fbd519513699917ff209951a42 /openstack | |
| parent | a4bb232614d2d9f975617dba4c58b05dcb87a36a (diff) | |
| parent | a7f23d95a2cfa727069d524132c1e9ee4fd2f149 (diff) | |
| download | oslo-ecdd50d4e00bf8b0607801e763cef4cb408e091f.tar.gz oslo-ecdd50d4e00bf8b0607801e763cef4cb408e091f.tar.xz oslo-ecdd50d4e00bf8b0607801e763cef4cb408e091f.zip | |
Merge "Fix Lack of reconnecting operation when using rabbitmq mirrored queue"
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/rpc/impl_kombu.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openstack/common/rpc/impl_kombu.py b/openstack/common/rpc/impl_kombu.py index e9b715d..3094678 100644 --- a/openstack/common/rpc/impl_kombu.py +++ b/openstack/common/rpc/impl_kombu.py @@ -165,9 +165,10 @@ class ConsumerBase(object): try: msg = rpc_common.deserialize_msg(message.payload) callback(msg) - message.ack() except Exception: LOG.exception(_("Failed to process message... skipping it.")) + finally: + message.ack() self.queue.consume(*args, callback=_callback, **options) |