summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorRussell Bryant <rbryant@redhat.com>2013-03-01 11:47:40 -0500
committerRussell Bryant <rbryant@redhat.com>2013-03-02 10:59:08 -0500
commit386a6fa8c96c1e6be43cc64e51d82a129ba5918f (patch)
treeb193cf55ad63ae410297597c7ec36e2b1a34e53b /openstack
parentc312fd6742c035677347a6987fb17b67e2c72087 (diff)
downloadoslo-386a6fa8c96c1e6be43cc64e51d82a129ba5918f.tar.gz
oslo-386a6fa8c96c1e6be43cc64e51d82a129ba5918f.tar.xz
oslo-386a6fa8c96c1e6be43cc64e51d82a129ba5918f.zip
Don't log a traceback on rpc call timeout.
There are cases where an rpc call is gracefully handled. The rpc drivers should just let the caller deal with this and decide whether it is an error worth logging a traceback over. Otherwise, we unnecessarily raise alarm by leaving a mess in the log file. Fix bug 1137994. Change-Id: I0e831ddcc43ffea78aae1fb5e46c5037c461b2a1
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/rpc/impl_kombu.py4
-rw-r--r--openstack/common/rpc/impl_qpid.py4
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') %