summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-03-12 15:23:39 +0000
committerGerrit Code Review <review@openstack.org>2013-03-12 15:23:39 +0000
commit8589eb84287c99c25f0e28a3a8c3ff40f4f99f4c (patch)
tree17f76fa1edb538ec4f39303b61d9f2e014efd1ea /openstack
parent21925b63af87c36be97eec5b212e06477471bb1e (diff)
parentb85e8303347b4ff16951e55e2be2d9b2d39d9678 (diff)
downloadoslo-8589eb84287c99c25f0e28a3a8c3ff40f4f99f4c.tar.gz
oslo-8589eb84287c99c25f0e28a3a8c3ff40f4f99f4c.tar.xz
oslo-8589eb84287c99c25f0e28a3a8c3ff40f4f99f4c.zip
Merge "Keep exc_info() to prevent an internal error"
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/rpc/amqp.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/openstack/common/rpc/amqp.py b/openstack/common/rpc/amqp.py
index 128c7d7..2dcb12b 100644
--- a/openstack/common/rpc/amqp.py
+++ b/openstack/common/rpc/amqp.py
@@ -443,9 +443,11 @@ class ProxyCallback(_ThreadPoolWithWait):
connection_pool=self.connection_pool,
log_failure=False)
except Exception:
- LOG.exception(_('Exception during message handling'))
- ctxt.reply(None, sys.exc_info(),
- connection_pool=self.connection_pool)
+ # sys.exc_info() is deleted by LOG.exception().
+ exc_info = sys.exc_info()
+ LOG.error(_('Exception during message handling'),
+ exc_info=exc_info)
+ ctxt.reply(None, exc_info, connection_pool=self.connection_pool)
class MulticallProxyWaiter(object):