diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-04 14:19:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-04 14:19:38 +0000 |
| commit | f39d38e08b187e2dbff0f57f487e022512b3a106 (patch) | |
| tree | c334b5b44a6ec2f2e76fdb35d659b423db64f510 /openstack | |
| parent | 4eae556d128fe1cd5583c40800e02689426ebbb1 (diff) | |
| parent | 386a6fa8c96c1e6be43cc64e51d82a129ba5918f (diff) | |
| download | oslo-f39d38e08b187e2dbff0f57f487e022512b3a106.tar.gz oslo-f39d38e08b187e2dbff0f57f487e022512b3a106.tar.xz oslo-f39d38e08b187e2dbff0f57f487e022512b3a106.zip | |
Merge "Don't log a traceback on rpc call timeout."
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/rpc/impl_kombu.py | 4 | ||||
| -rw-r--r-- | openstack/common/rpc/impl_qpid.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/openstack/common/rpc/impl_kombu.py b/openstack/common/rpc/impl_kombu.py index b63edea..aa0a2d5 100644 --- a/openstack/common/rpc/impl_kombu.py +++ b/openstack/common/rpc/impl_kombu.py @@ -624,8 +624,8 @@ class Connection(object): def _error_callback(exc): if isinstance(exc, socket.timeout): - LOG.exception(_('Timed out waiting for RPC response: %s') % - str(exc)) + LOG.debug(_('Timed out waiting for RPC response: %s') % + str(exc)) raise rpc_common.Timeout() else: LOG.exception(_('Failed to consume message from queue: %s') % diff --git a/openstack/common/rpc/impl_qpid.py b/openstack/common/rpc/impl_qpid.py index 6c5cf9b..c54e5bf 100644 --- a/openstack/common/rpc/impl_qpid.py +++ b/openstack/common/rpc/impl_qpid.py @@ -415,8 +415,8 @@ class Connection(object): def _error_callback(exc): if isinstance(exc, qpid_exceptions.Empty): - LOG.exception(_('Timed out waiting for RPC response: %s') % - str(exc)) + LOG.debug(_('Timed out waiting for RPC response: %s') % + str(exc)) raise rpc_common.Timeout() else: LOG.exception(_('Failed to consume message from queue: %s') % |