diff options
| author | Mehdi Abaakouk <sileht@redhat.com> | 2015-12-09 18:49:19 +0100 |
|---|---|---|
| committer | Mehdi Abaakouk <sileht@redhat.com> | 2015-12-09 18:53:38 +0100 |
| commit | e72599435c59c09277a9da7686b32aa4f9df7ba4 (patch) | |
| tree | cc36540129b27ac752036230b02a36469648d560 | |
| parent | 185693a6ed57e02b2f94b0fb8f14a91471605969 (diff) | |
| download | oslo-messaging-e72599435c59c09277a9da7686b32aa4f9df7ba4.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
Change-Id: Ic1ddec2d13172532dbaa572d04a4c22c97ac4fe7
| -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 b9ff363..f8b4aea 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -700,6 +700,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 |