Merge "Handle debug messages cleanly" into feature/zuulv3
This commit is contained in:
commit
c0bd5e3b99
|
@ -10,6 +10,10 @@
|
|||
debug:
|
||||
var: setupvar
|
||||
|
||||
- name: Output a debug sentence
|
||||
debug:
|
||||
msg: This is a debug message
|
||||
|
||||
- name: Run a shell task
|
||||
command: ip addr show
|
||||
|
||||
|
|
|
@ -373,6 +373,17 @@ class CallbackModule(default.CallbackModule):
|
|||
for key in [k for k in result_dict.keys()
|
||||
if k.startswith('_ansible')]:
|
||||
del result_dict[key]
|
||||
keyname = next(iter(result_dict.keys()))
|
||||
# If it has msg, that means it was like:
|
||||
#
|
||||
# debug:
|
||||
# msg: Some debug text the user was looking for
|
||||
#
|
||||
# So we log it with self._log to get just the raw string the
|
||||
# user provided.
|
||||
if keyname == 'msg':
|
||||
self._log(msg=result_dict['msg'])
|
||||
else:
|
||||
self._log_message(
|
||||
msg=json.dumps(result_dict, indent=2, sort_keys=True),
|
||||
status=status, result=result)
|
||||
|
|
Loading…
Reference in New Issue