diff options
author | Russell Bryant <rbryant@redhat.com> | 2012-05-01 17:31:26 -0400 |
---|---|---|
committer | Russell Bryant <rbryant@redhat.com> | 2012-05-02 16:05:58 -0400 |
commit | 29dc47bd5045853d83a2343ec88c36ea89db188d (patch) | |
tree | 4a7d4696ceed6ddf34976445bf90a14480e1170e /nova/openstack | |
parent | 1d97b77ea4c31f1fb17bc20cc4c16a3f6edf2cf1 (diff) | |
download | nova-29dc47bd5045853d83a2343ec88c36ea89db188d.tar.gz nova-29dc47bd5045853d83a2343ec88c36ea89db188d.tar.xz nova-29dc47bd5045853d83a2343ec88c36ea89db188d.zip |
Use save_and_reraise_exception() from common.
This patch common.excutils from openstack-common, which includes
save_and_reraise_exception(). The patch also converts the code
base to use it from there instead of nova.utils and then removes
it from nova.utils.
The initial motivation for this was removing another nova dependency
from nova.rpc so that it can eventually be moved to openstack-common.
Change-Id: I7354ca51a02aec9c709cf33f77d4abc46acc2742
Diffstat (limited to 'nova/openstack')
-rw-r--r-- | nova/openstack/common/excutils.py | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/nova/openstack/common/excutils.py b/nova/openstack/common/excutils.py new file mode 100644 index 000000000..3cb678e9d --- /dev/null +++ b/nova/openstack/common/excutils.py @@ -0,0 +1,49 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC. +# Copyright 2012, Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +""" +Exception related utilities. +""" + +import contextlib +import logging +import sys +import traceback + + +@contextlib.contextmanager +def save_and_reraise_exception(): + """Save current exception, run some code and then re-raise. + + In some cases the exception context can be cleared, resulting in None + being attempted to be reraised after an exception handler is run. This + can happen when eventlet switches greenthreads or when running an + exception handler, code raises and catches an exception. In both + cases the exception context will be cleared. + + To work around this, we save the exception state, run handler code, and + then re-raise the original exception. If another exception occurs, the + saved exception is logged and the new exception is reraised. + """ + type_, value, tb = sys.exc_info() + try: + yield + except Exception: + logging.error('Original exception being dropped: %s' % + (traceback.format_exception(type_, value, tb))) + raise + raise type_, value, tb |