openstack
/
oslo.messaging
Code Issues Proposed changes

Merge "Drop a python 2 exception management"

This commit is contained in:
Zuul 2020-07-17 16:28:14 +00:00 committed by Gerrit Code Review
parent afb035d971 661bdd7f41
commit f988751c5c
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
oslo_messaging/_drivers/impl_rabbit.py
View File

@ -975,13 +975,6 @@ class Connection(object):
def _heartbeat_thread_job(self): def _heartbeat_thread_job(self):
"""Thread that maintains inactive connections """Thread that maintains inactive connections
""" """
# NOTE(hberaud): Python2 doesn't have ConnectionRefusedError
# defined so to switch connections destination on failure
# with python2 and python3 we need to wrapp adapt connection refused
try:
ConnectRefuseError = ConnectionRefusedError
except NameError:
ConnectRefuseError = socket.error
while not self._heartbeat_exit_event.is_set(): while not self._heartbeat_exit_event.is_set():
with self._connection_lock.for_heartbeat(): with self._connection_lock.for_heartbeat():
@ -1008,7 +1001,7 @@ class Connection(object):
# ensure_connection for switching the # ensure_connection for switching the
# connection destination. # connection destination.
except (socket.timeout, except (socket.timeout,
ConnectRefuseError, ConnectionRefusedError,
OSError, OSError,
kombu.exceptions.OperationalError) as exc: kombu.exceptions.OperationalError) as exc:
LOG.info("A recoverable connection/channel error " LOG.info("A recoverable connection/channel error "