diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-12-10 06:44:32 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-12-10 06:44:32 +0000 |
commit | 28e9004dc1e38f3aa2f6ee7113f3e23c7c2319a0 (patch) | |
tree | b35113d430a1e0ef8448d584fa97a67054141664 | |
parent | 7f08805bc9908a374681202b3e14d4e311eaefcf (diff) | |
parent | e72599435c59c09277a9da7686b32aa4f9df7ba4 (diff) | |
download | oslo-messaging-28e9004dc1e38f3aa2f6ee7113f3e23c7c2319a0.tar.gz |
Merge "Don't trigger error_callback for known exc"
-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 3742ba5..a62d0fb 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -703,6 +703,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 |