openstack/heat
Code Issues Proposed changes

Merge "Improve logging of unexpected exceptions"

Browse Source
This commit is contained in:
Jenkins 2016-05-18 10:16:14 +00:00 committed by Gerrit Code Review
commit a1c6645f3a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
heat/engine/stack.py
View File

@ -79,16 +79,22 @@ def reset_state_on_error(func):
errmsg = None errmsg = None
try: try:
return func(stack, *args, **kwargs) return func(stack, *args, **kwargs)
except BaseException as exc: except Exception as exc:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
errmsg = six.text_type(exc) errmsg = six.text_type(exc)
LOG.error(_LE('Unexpected exception in %(func)s: %(msg)s'), LOG.error(_LE('Unexpected exception in %(func)s: %(msg)s'),
{'func': func.__name__, 'msg': errmsg}) {'func': func.__name__, 'msg': errmsg})
except BaseException as exc:
with excutils.save_and_reraise_exception():
exc_type = type(exc).__name__
errmsg = '%s(%s)' % (exc_type, six.text_type(exc))
LOG.info(_LI('Stopped due to %(msg)s in %(func)s'),
{'func': func.__name__, 'msg': errmsg})
finally: finally:
if stack.status == stack.IN_PROGRESS: if stack.status == stack.IN_PROGRESS:
msg = _("Unexpected returning while IN_PROGRESS.") rtnmsg = _("Unexpected exit while IN_PROGRESS.")
stack.state_set(stack.action, stack.FAILED, stack.state_set(stack.action, stack.FAILED,
errmsg if errmsg is not None else msg) errmsg if errmsg is not None else rtnmsg)
assert errmsg is not None, "Returned while IN_PROGRESS." assert errmsg is not None, "Returned while IN_PROGRESS."
return handle_exceptions return handle_exceptions