diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-04-15 11:47:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-04-15 11:47:45 +0000 |
| commit | a8bf8a0f7418ca3aad7e04ce441ba513c0c1ec08 (patch) | |
| tree | 0ebf36d931a1823e51c67b86bc3439298812d877 | |
| parent | 81af48dfa879ea87a6a5ae5c43edbba5123ecfd6 (diff) | |
| parent | fae88f6805f6a16a60c23da67ce06cc0c78a706d (diff) | |
| download | oslo-incubator-a8bf8a0f7418ca3aad7e04ce441ba513c0c1ec08.tar.gz | |
Merge "Update ensure()/reconnect() to catch MessagingError" into stable/havana
| -rw-r--r-- | openstack/common/rpc/impl_qpid.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openstack/common/rpc/impl_qpid.py b/openstack/common/rpc/impl_qpid.py index 1a69e8e9..c68ff70e 100644 --- a/openstack/common/rpc/impl_qpid.py +++ b/openstack/common/rpc/impl_qpid.py @@ -505,7 +505,7 @@ class Connection(object): if self.connection.opened(): try: self.connection.close() - except qpid_exceptions.ConnectionError: + except qpid_exceptions.MessagingError: pass broker = self.brokers[next(self.next_broker_indices)] @@ -513,7 +513,7 @@ class Connection(object): try: self.connection_create(broker) self.connection.open() - except qpid_exceptions.ConnectionError as e: + except qpid_exceptions.MessagingError as e: msg_dict = dict(e=e, delay=delay) msg = _("Unable to connect to AMQP server: %(e)s. " "Sleeping %(delay)s seconds") % msg_dict @@ -541,7 +541,7 @@ class Connection(object): try: return method(*args, **kwargs) except (qpid_exceptions.Empty, - qpid_exceptions.ConnectionError) as e: + qpid_exceptions.MessagingError) as e: if error_callback: error_callback(e) self.reconnect() |