summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-03-25 08:31:53 +0000
committerGerrit Code Review <review@openstack.org>2013-03-25 08:31:53 +0000
commit552e632fa8c513c86da6713c012a96ea38995a7b (patch)
tree486c2f9dbbb776b310d92863285cb83d8fba4355 /nova
parentdf0560f0353bc0837cc62cfaa9029d21d45c529e (diff)
parent132a0c1fd1eb127e393e5794ffa6d4a3a4950567 (diff)
downloadnova-552e632fa8c513c86da6713c012a96ea38995a7b.tar.gz
nova-552e632fa8c513c86da6713c012a96ea38995a7b.tar.xz
nova-552e632fa8c513c86da6713c012a96ea38995a7b.zip
Merge "Don't log traceback on rpc timeout."
Diffstat (limited to 'nova')
-rw-r--r--nova/openstack/common/rpc/amqp.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/nova/openstack/common/rpc/amqp.py b/nova/openstack/common/rpc/amqp.py
index c23e36ec8..cc0098cc3 100644
--- a/nova/openstack/common/rpc/amqp.py
+++ b/nova/openstack/common/rpc/amqp.py
@@ -495,7 +495,6 @@ class MulticallProxyWaiter(object):
data = self._dataqueue.get(timeout=self._timeout)
result = self._process_data(data)
except queue.Empty:
- LOG.exception(_('Timed out waiting for RPC response.'))
self.done()
raise rpc_common.Timeout()
except Exception: