openstack/oslo.messaging
Code Issues Proposed changes

Merge "Publish tracebacks only on debug level"

Browse Source
This commit is contained in:
Jenkins 2015-03-19 13:14:37 +00:00 committed by Gerrit Code Review
commit dcd027cc16
1 changed files with 8 additions and 6 deletions

14
oslo_messaging/_drivers/impl_rabbit.py

@ -953,8 +953,9 @@ class Connection(object):
"occurred, trying to reconnect: %s"), exc) "occurred, trying to reconnect: %s"), exc)
self.ensure_connection() self.ensure_connection()
except Exception: except Exception:
LOG.exception(_LE("Unexpected error during heartbeart " LOG.warning(_LW("Unexpected error during heartbeart "
"thread processing, retrying...")) "thread processing, retrying..."))
LOG.debug('Exception', exc_info=True)
self._heartbeat_exit_event.wait( self._heartbeat_exit_event.wait(
timeout=self._heartbeat_wait_timeout) timeout=self._heartbeat_wait_timeout)
@ -999,8 +1000,8 @@ class Connection(object):
def _error_callback(exc): def _error_callback(exc):
_recoverable_error_callback(exc) _recoverable_error_callback(exc)
LOG.exception(_('Failed to consume message from queue: %s'), LOG.error(_('Failed to consume message from queue: %s'),
exc) exc)
def _consume(): def _consume():
if self.do_consume: if self.do_consume:
@ -1038,8 +1039,9 @@ class Connection(object):
@staticmethod @staticmethod
def _log_publisher_send_error(topic, exc): def _log_publisher_send_error(topic, exc):
log_info = {'topic': topic, 'err_str': exc} log_info = {'topic': topic, 'err_str': exc}
LOG.exception(_("Failed to publish message to topic " LOG.error(_("Failed to publish message to topic "
"'%(topic)s': %(err_str)s"), log_info) "'%(topic)s': %(err_str)s"), log_info)
LOG.debug('Exception', exc_info=exc)
default_marker = object() default_marker = object()