openstack/oslo.messaging
Code Issues Proposed changes

Merge "Suppress excessive debug logs when consume rabbit"

Browse Source
This commit is contained in:
Jenkins 2017-09-07 23:24:51 +00:00 committed by Gerrit Code Review
commit 338b85eb4e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
oslo_messaging/_drivers/impl_rabbit.py
View File

@ -1027,14 +1027,13 @@ class Connection(object):
timer = rpc_common.DecayingTimer(duration=timeout) timer = rpc_common.DecayingTimer(duration=timeout)
timer.start() timer.start()
def _raise_timeout(exc): def _raise_timeout():
LOG.debug('Timed out waiting for RPC response: %s', exc)
raise rpc_common.Timeout() raise rpc_common.Timeout()
def _recoverable_error_callback(exc): def _recoverable_error_callback(exc):
if not isinstance(exc, rpc_common.Timeout): if not isinstance(exc, rpc_common.Timeout):
self._new_tags = set(self._consumers.values()) self._new_tags = set(self._consumers.values())
timer.check_return(_raise_timeout, exc) timer.check_return(_raise_timeout)
def _error_callback(exc): def _error_callback(exc):
_recoverable_error_callback(exc) _recoverable_error_callback(exc)
@ -1067,9 +1066,9 @@ class Connection(object):
try: try:
self.connection.drain_events(timeout=poll_timeout) self.connection.drain_events(timeout=poll_timeout)
return return
except socket.timeout as exc: except socket.timeout:
poll_timeout = timer.check_return( 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: except self.connection.channel_errors as exc:
if exc.code == 406 and exc.method_name == 'Basic.ack': if exc.code == 406 and exc.method_name == 'Basic.ack':
# NOTE(gordc): occasionally multiple workers will grab # NOTE(gordc): occasionally multiple workers will grab