openstack
/
heat
Code Issues Proposed changes

Merge "Downgrade some exception logs to INFO level"

This commit is contained in:
Jenkins 2016-06-09 06:43:15 +00:00 committed by Gerrit Code Review
parent 6eb3f02d60 490702f285
commit 1e47fac48d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/resource.py
View File

@ -1971,8 +1971,9 @@ class Resource(object):
# Don't log an event as it just spams the user. # Don't log an event as it just spams the user.
pass pass
except Exception as ex: except Exception as ex:
LOG.exception(_LE('signal %(name)s : %(msg)s') LOG.info(_LI('signal %(name)s : %(msg)s'),
% {'name': six.text_type(self), 'msg': ex}) {'name': six.text_type(self), 'msg': ex},
exc_info=True)
failure = exception.ResourceFailure(ex, self) failure = exception.ResourceFailure(ex, self)
raise failure raise failure

10
heat/engine/stack.py
View File

@ -775,7 +775,7 @@ class Stack(collections.Mapping):
except AssertionError: except AssertionError:
raise raise
except Exception as ex: except Exception as ex:
LOG.exception(_LE("Exception: %s"), ex) LOG.info(_LI("Exception in stack validation"), exc_info=True)
raise exception.StackValidationFailed( raise exception.StackValidationFailed(
message=encodeutils.safe_decode(six.text_type(ex))) message=encodeutils.safe_decode(six.text_type(ex)))
if result: if result:
@ -1852,8 +1852,8 @@ class Stack(collections.Mapping):
scheduler.TaskRunner(res.destroy)() scheduler.TaskRunner(res.destroy)()
except exception.ResourceFailure as ex: except exception.ResourceFailure as ex:
failed = True failed = True
LOG.error(_LE('Resource %(name)s delete failed: %(ex)s'), LOG.info(_LI('Resource %(name)s delete failed: %(ex)s'),
{'name': res.name, 'ex': ex}) {'name': res.name, 'ex': ex})
for res in deps: for res in deps:
if not failed: if not failed:
@ -1861,9 +1861,9 @@ class Stack(collections.Mapping):
res.state_reset() res.state_reset()
scheduler.TaskRunner(res.create)() scheduler.TaskRunner(res.create)()
except exception.ResourceFailure as ex: except exception.ResourceFailure as ex:
LOG.exception(_LE('Resource %(name)s create failed: '
'%(ex)s'), {'name': res.name, 'ex': ex})
failed = True failed = True
LOG.info(_LI('Resource %(name)s create failed: '
'%(ex)s'), {'name': res.name, 'ex': ex})
else: else:
res.state_set(res.CREATE, res.FAILED, res.state_set(res.CREATE, res.FAILED,
'Resource restart aborted') 'Resource restart aborted')