mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-01-11 23:25:28 +01:00
Compare commits
No commits in common. "b9feff586f095daeefa9fcfe8d232968d0552291" and "da1713ed3efe2abba118b4d05ac89b81748c945d" have entirely different histories.
b9feff586f
...
da1713ed3e
3 changed files with 2 additions and 36 deletions
|
|
@ -1,2 +0,0 @@
|
||||||
minor_changes:
|
|
||||||
- json and jsonl - Add the ``ANSIBLE_JSON_INDENT`` parameter
|
|
||||||
|
|
@ -25,16 +25,6 @@ DOCUMENTATION = '''
|
||||||
- key: show_custom_stats
|
- key: show_custom_stats
|
||||||
section: defaults
|
section: defaults
|
||||||
type: bool
|
type: bool
|
||||||
json_indent:
|
|
||||||
name: Use indenting for the JSON output
|
|
||||||
description: 'If specified, use this many spaces for indenting in the JSON output. If <= 0, write to a single line.'
|
|
||||||
default: 4
|
|
||||||
env:
|
|
||||||
- name: ANSIBLE_JSON_INDENT
|
|
||||||
ini:
|
|
||||||
- key: json_indent
|
|
||||||
section: defaults
|
|
||||||
type: integer
|
|
||||||
notes:
|
notes:
|
||||||
- When using a strategy such as free, host_pinned, or a custom strategy, host results will
|
- When using a strategy such as free, host_pinned, or a custom strategy, host results will
|
||||||
be added to new task results in ``.plays[].tasks[]``. As such, there will exist duplicate
|
be added to new task results in ``.plays[].tasks[]``. As such, there will exist duplicate
|
||||||
|
|
@ -71,12 +61,6 @@ class CallbackModule(CallbackBase):
|
||||||
self._task_map = {}
|
self._task_map = {}
|
||||||
self._is_lockstep = False
|
self._is_lockstep = False
|
||||||
|
|
||||||
self.set_options()
|
|
||||||
|
|
||||||
self._json_indent = self.get_option('json_indent')
|
|
||||||
if self._json_indent <= 0:
|
|
||||||
self._json_indent = None
|
|
||||||
|
|
||||||
def _new_play(self, play):
|
def _new_play(self, play):
|
||||||
self._is_lockstep = play.strategy in LOCKSTEP_CALLBACKS
|
self._is_lockstep = play.strategy in LOCKSTEP_CALLBACKS
|
||||||
return {
|
return {
|
||||||
|
|
@ -161,7 +145,7 @@ class CallbackModule(CallbackBase):
|
||||||
'global_custom_stats': global_custom_stats,
|
'global_custom_stats': global_custom_stats,
|
||||||
}
|
}
|
||||||
|
|
||||||
self._display.display(json.dumps(output, cls=AnsibleJSONEncoder, indent=self._json_indent, sort_keys=True))
|
self._display.display(json.dumps(output, cls=AnsibleJSONEncoder, indent=4, sort_keys=True))
|
||||||
|
|
||||||
def _record_task_result(self, on_info, result, **kwargs):
|
def _record_task_result(self, on_info, result, **kwargs):
|
||||||
"""This function is used as a partial to add failed/skipped info in a single method"""
|
"""This function is used as a partial to add failed/skipped info in a single method"""
|
||||||
|
|
|
||||||
|
|
@ -26,16 +26,6 @@ DOCUMENTATION = '''
|
||||||
- key: show_custom_stats
|
- key: show_custom_stats
|
||||||
section: defaults
|
section: defaults
|
||||||
type: bool
|
type: bool
|
||||||
json_indent:
|
|
||||||
name: Use indenting for the JSON output
|
|
||||||
description: 'If specified, use this many spaces for indenting in the JSON output. If not specified or <= 0, write to a single line.'
|
|
||||||
default: 0
|
|
||||||
env:
|
|
||||||
- name: ANSIBLE_JSON_INDENT
|
|
||||||
ini:
|
|
||||||
- key: json_indent
|
|
||||||
section: defaults
|
|
||||||
type: integer
|
|
||||||
notes:
|
notes:
|
||||||
- When using a strategy such as free, host_pinned, or a custom strategy, host results will
|
- When using a strategy such as free, host_pinned, or a custom strategy, host results will
|
||||||
be added to new task results in ``.plays[].tasks[]``. As such, there will exist duplicate
|
be added to new task results in ``.plays[].tasks[]``. As such, there will exist duplicate
|
||||||
|
|
@ -73,12 +63,6 @@ class CallbackModule(CallbackBase):
|
||||||
self._task_map = {}
|
self._task_map = {}
|
||||||
self._is_lockstep = False
|
self._is_lockstep = False
|
||||||
|
|
||||||
self.set_options()
|
|
||||||
|
|
||||||
self._json_indent = self.get_option('json_indent')
|
|
||||||
if self._json_indent <= 0:
|
|
||||||
self._json_indent = None
|
|
||||||
|
|
||||||
def _new_play(self, play):
|
def _new_play(self, play):
|
||||||
self._is_lockstep = play.strategy in LOCKSTEP_CALLBACKS
|
self._is_lockstep = play.strategy in LOCKSTEP_CALLBACKS
|
||||||
return {
|
return {
|
||||||
|
|
@ -174,7 +158,7 @@ class CallbackModule(CallbackBase):
|
||||||
def _write_event(self, event_name, output):
|
def _write_event(self, event_name, output):
|
||||||
output['_event'] = event_name
|
output['_event'] = event_name
|
||||||
output['_timestamp'] = current_time()
|
output['_timestamp'] = current_time()
|
||||||
self._display.display(json.dumps(output, cls=AnsibleJSONEncoder, indent=self._json_indent, separators=',:', sort_keys=True))
|
self._display.display(json.dumps(output, cls=AnsibleJSONEncoder, separators=',:', sort_keys=True))
|
||||||
|
|
||||||
def _record_task_result(self, event_name, on_info, result, **kwargs):
|
def _record_task_result(self, event_name, on_info, result, **kwargs):
|
||||||
"""This function is used as a partial to add failed/skipped info in a single method"""
|
"""This function is used as a partial to add failed/skipped info in a single method"""
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue