openstack
/
neutron
Code Issues Proposed changes

Merge "Update ensure()/reconnect() to catch MessagingError"

This commit is contained in:
Jenkins 2014-04-10 16:04:06 +00:00 committed by Gerrit Code Review
parent 2ddc62d0c0 9a830b3705
commit d7821281e9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/openstack/common/rpc/impl_qpid.py
View File

@ -504,7 +504,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)]
@ -512,7 +512,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 = _LE("Unable to connect to AMQP server: %(e)s. "
"Sleeping %(delay)s seconds") % msg_dict
@ -540,7 +540,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()