ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix invocation-output-supression code to still provide invocation data to the callbacks.

Browse source
This commit is contained in:
Michael DeHaan 2012-09-04 21:16:12 -04:00
parent 2843e31e09
commit 96f257cea1
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/ansible/callbacks.py
View file

@ -266,9 +266,9 @@ class CliRunnerCallbacks(DefaultRunnerCallbacks):
def _on_any(self, host, result): def _on_any(self, host, result):
result2 = result.copy() result2 = result.copy()
result2.pop('invocation', None) result2.pop('invocation', None)
print host_report_msg(host, self.options.module_name, result, self.options.one_line) print host_report_msg(host, self.options.module_name, result2, self.options.one_line)
if self.options.tree: if self.options.tree:
utils.write_tree_file(self.options.tree, host, utils.jsonify(result,format=True)) utils.write_tree_file(self.options.tree, host, utils.jsonify(result2,format=True))
######################################################################## ########################################################################
@ -292,14 +292,14 @@ class PlaybookRunnerCallbacks(DefaultRunnerCallbacks):
def on_failed(self, host, results, ignore_errors=False): def on_failed(self, host, results, ignore_errors=False):
results = results.copy() results2 = results.copy()
results.pop('invocation', None) results2.pop('invocation', None)
item = results.get('item', None) item = results2.get('item', None)
if item: if item:
msg = "failed: [%s] => (item=%s) => %s" % (host, item, utils.jsonify(results)) msg = "failed: [%s] => (item=%s) => %s" % (host, item, utils.jsonify(results2))
else: else:
msg = "failed: [%s] => %s" % (host, utils.jsonify(results)) msg = "failed: [%s] => %s" % (host, utils.jsonify(results2))
print stringc(msg, 'red') print stringc(msg, 'red')
if ignore_errors: if ignore_errors:
print stringc("...ignoring", 'yellow') print stringc("...ignoring", 'yellow')
@ -308,12 +308,12 @@ class PlaybookRunnerCallbacks(DefaultRunnerCallbacks):
def on_ok(self, host, host_result): def on_ok(self, host, host_result):
item = host_result.get('item', None) item = host_result.get('item', None)
host_result = host_result.copy() host_result2 = host_result.copy()
host_result.pop('invocation', None) host_result2.pop('invocation', None)
# show verbose output for non-setup module results if --verbose is used # show verbose output for non-setup module results if --verbose is used
msg = '' msg = ''
if not self.verbose or host_result.get("verbose_override",None) is not None: if not self.verbose or host_result2.get("verbose_override",None) is not None:
if item: if item:
msg = "ok: [%s] => (item=%s)" % (host,item) msg = "ok: [%s] => (item=%s)" % (host,item)
else: else:
@ -322,13 +322,13 @@ class PlaybookRunnerCallbacks(DefaultRunnerCallbacks):
else: else:
# verbose ... # verbose ...
if item: if item:
msg = "ok: [%s] => (item=%s) => %s" % (host, item, utils.jsonify(host_result)) msg = "ok: [%s] => (item=%s) => %s" % (host, item, utils.jsonify(host_result2))
else: else:
if 'ansible_job_id' not in host_result or 'finished' in host_result: if 'ansible_job_id' not in host_result or 'finished' in host_result2:
msg = "ok: [%s] => %s" % (host, utils.jsonify(host_result)) msg = "ok: [%s] => %s" % (host, utils.jsonify(host_result2))
if msg != '': if msg != '':
if not 'changed' in host_result or not host_result['changed']: if not 'changed' in host_result2 or not host_result['changed']:
print stringc(msg, 'green') print stringc(msg, 'green')
else: else:
print stringc(msg, 'yellow') print stringc(msg, 'yellow')