zuul
/
zuul
Code Issues Proposed changes

Merge "Log items in loops better" into feature/zuulv3

This commit is contained in:
Jenkins 2017-07-21 05:39:06 +00:00 committed by Gerrit Code Review
parent 238c335a2a c1229468ad
commit 0ca6461abd
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zuul/ansible/callback/zuul_stream.py
View File

@ -358,10 +358,15 @@ class CallbackModule(default.CallbackModule):
status = 'ok'
if result._task.action not in ('command', 'shell'):
self._log_message(
result=result,
msg="Item: {item}".format(item=result_dict['item']),
status=status)
if 'msg' in result_dict:
self._log_message(
result=result, msg=result_dict['msg'], status=status)
else:
self._log_message(
result=result,
msg=json.dumps(result_dict['item'],
indent=2, sort_keys=True),
status=status)
else:
self._log_message(
result,
@ -481,7 +486,8 @@ class CallbackModule(default.CallbackModule):
host=hostname,
msg="Output suppressed because no_log was given"))
return
if not msg and set(result_dict.keys()) == set(['msg', 'failed']):
if (not msg and result_dict
and set(result_dict.keys()) == set(['msg', 'failed'])):
msg = result_dict['msg']
result_dict = None
if msg: