diff options
Diffstat (limited to 'oslo_messaging/_drivers/impl_rabbit.py')
| -rw-r--r-- | oslo_messaging/_drivers/impl_rabbit.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index 036bbd0..59ecf7d 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -1033,14 +1033,13 @@ class Connection(object): timer = rpc_common.DecayingTimer(duration=timeout) timer.start() - def _raise_timeout(exc): - LOG.debug('Timed out waiting for RPC response: %s', exc) + def _raise_timeout(): raise rpc_common.Timeout() def _recoverable_error_callback(exc): if not isinstance(exc, rpc_common.Timeout): self._new_tags = set(self._consumers.values()) - timer.check_return(_raise_timeout, exc) + timer.check_return(_raise_timeout) def _error_callback(exc): _recoverable_error_callback(exc) @@ -1073,9 +1072,9 @@ class Connection(object): try: self.connection.drain_events(timeout=poll_timeout) return - except socket.timeout as exc: + except socket.timeout: poll_timeout = timer.check_return( - _raise_timeout, exc, maximum=self._poll_timeout) + _raise_timeout, maximum=self._poll_timeout) except self.connection.channel_errors as exc: if exc.code == 406 and exc.method_name == 'Basic.ack': # NOTE(gordc): occasionally multiple workers will grab |