diff options
| author | Mehdi Abaakouk <sileht@redhat.com> | 2015-12-09 18:49:19 +0100 |
|---|---|---|
| committer | Mehdi Abaakouk (sileht) <sileht@redhat.com> | 2015-12-11 07:22:54 +0000 |
| commit | 9e095c4bd84c3e83e394071c4f49a8bba3eb1dd6 (patch) | |
| tree | 5a70ea2425149d3257ba7d0cdbd2b9cb9bc0e8dc /oslo_messaging | |
| parent | 8504e2508bbec963ae817cc31fec509d058c0e96 (diff) | |
| download | oslo-messaging-9e095c4bd84c3e83e394071c4f49a8bba3eb1dd6.tar.gz | |
Don't trigger error_callback for known exc
When AMQPDestinationNotFound is raised, we must not
call the error_callback method. The exception is logged
only if needed in upper layer (amqpdriver.py).
Related-bug: #1524418
Related-bug: #1521958
(cherry picked from commit Ic1ddec2d13172532dbaa572d04a4c22c97ac4fe7)
Change-Id: Id874fcfb50b1661031589bfb6d93ddb84a1467c6
Diffstat (limited to 'oslo_messaging')
| -rw-r--r-- | oslo_messaging/_drivers/impl_rabbit.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index 75d4cde..9c9fbe4 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -705,6 +705,10 @@ class Connection(object): 'tries: %(err_str)s') % info LOG.error(msg) raise exceptions.MessageDeliveryFailure(msg) + except rpc_amqp.AMQPDestinationNotFound: + # NOTE(sileht): we must reraise this without + # trigger error_callback + raise except Exception as exc: error_callback and error_callback(exc) raise |