mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
unixy Callback: Use Ansible's config manager (#5601)
* unixy Callback: Use Ansible's config manager
In ansible-core 2.14 deprecated support was removed[1] for accessing options
of the DefaultCallback via class attributes. Use the "new" config system
instead.
[1]: dbdbfe845a
Fixes #5600.
Signed-off-by: Fabian P. Schmidt <kerel@mailbox.org>
* Update changelog fragment.
Signed-off-by: Fabian P. Schmidt <kerel@mailbox.org>
Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
parent
1ca775248f
commit
53da86c1a5
2 changed files with 8 additions and 6 deletions
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- unixy callback plugin - fix plugin to work with ansible-core 2.14 by using Ansible's configuration manager for handling options (https://github.com/ansible-collections/community.general/issues/5600).
|
|
@ -63,7 +63,7 @@ class CallbackModule(CallbackModule_default):
|
||||||
|
|
||||||
def _preprocess_result(self, result):
|
def _preprocess_result(self, result):
|
||||||
self.delegated_vars = result._result.get('_ansible_delegated_vars', None)
|
self.delegated_vars = result._result.get('_ansible_delegated_vars', None)
|
||||||
self._handle_exception(result._result, use_stderr=self.display_failed_stderr)
|
self._handle_exception(result._result, use_stderr=self.get_option('display_failed_stderr'))
|
||||||
self._handle_warnings(result._result)
|
self._handle_warnings(result._result)
|
||||||
|
|
||||||
def _process_result_output(self, result, msg):
|
def _process_result_output(self, result, msg):
|
||||||
|
@ -109,7 +109,7 @@ class CallbackModule(CallbackModule_default):
|
||||||
self._display.display(msg)
|
self._display.display(msg)
|
||||||
|
|
||||||
def v2_runner_on_skipped(self, result, ignore_errors=False):
|
def v2_runner_on_skipped(self, result, ignore_errors=False):
|
||||||
if self.display_skipped_hosts:
|
if self.get_option('display_skipped_hosts'):
|
||||||
self._preprocess_result(result)
|
self._preprocess_result(result)
|
||||||
display_color = C.COLOR_SKIP
|
display_color = C.COLOR_SKIP
|
||||||
msg = "skipped"
|
msg = "skipped"
|
||||||
|
@ -128,7 +128,7 @@ class CallbackModule(CallbackModule_default):
|
||||||
msg += " | item: %s" % (item_value,)
|
msg += " | item: %s" % (item_value,)
|
||||||
|
|
||||||
task_result = self._process_result_output(result, msg)
|
task_result = self._process_result_output(result, msg)
|
||||||
self._display.display(" " + task_result, display_color, stderr=self.display_failed_stderr)
|
self._display.display(" " + task_result, display_color, stderr=self.get_option('display_failed_stderr'))
|
||||||
|
|
||||||
def v2_runner_on_ok(self, result, msg="ok", display_color=C.COLOR_OK):
|
def v2_runner_on_ok(self, result, msg="ok", display_color=C.COLOR_OK):
|
||||||
self._preprocess_result(result)
|
self._preprocess_result(result)
|
||||||
|
@ -142,7 +142,7 @@ class CallbackModule(CallbackModule_default):
|
||||||
display_color = C.COLOR_CHANGED
|
display_color = C.COLOR_CHANGED
|
||||||
task_result = self._process_result_output(result, msg)
|
task_result = self._process_result_output(result, msg)
|
||||||
self._display.display(" " + task_result, display_color)
|
self._display.display(" " + task_result, display_color)
|
||||||
elif self.display_ok_hosts:
|
elif self.get('display_ok_hosts'):
|
||||||
task_result = self._process_result_output(result, msg)
|
task_result = self._process_result_output(result, msg)
|
||||||
self._display.display(" " + task_result, display_color)
|
self._display.display(" " + task_result, display_color)
|
||||||
|
|
||||||
|
@ -162,7 +162,7 @@ class CallbackModule(CallbackModule_default):
|
||||||
display_color = C.COLOR_UNREACHABLE
|
display_color = C.COLOR_UNREACHABLE
|
||||||
task_result = self._process_result_output(result, msg)
|
task_result = self._process_result_output(result, msg)
|
||||||
|
|
||||||
self._display.display(" " + task_result, display_color, stderr=self.display_failed_stderr)
|
self._display.display(" " + task_result, display_color, stderr=self.get_option('display_failed_stderr'))
|
||||||
|
|
||||||
def v2_on_file_diff(self, result):
|
def v2_on_file_diff(self, result):
|
||||||
if result._task.loop and 'results' in result._result:
|
if result._task.loop and 'results' in result._result:
|
||||||
|
@ -205,7 +205,7 @@ class CallbackModule(CallbackModule_default):
|
||||||
colorize(u'ignored', t['ignored'], None)),
|
colorize(u'ignored', t['ignored'], None)),
|
||||||
log_only=True
|
log_only=True
|
||||||
)
|
)
|
||||||
if stats.custom and self.show_custom_stats:
|
if stats.custom and self.get_option('show_custom_stats'):
|
||||||
self._display.banner("CUSTOM STATS: ")
|
self._display.banner("CUSTOM STATS: ")
|
||||||
# per host
|
# per host
|
||||||
# TODO: come up with 'pretty format'
|
# TODO: come up with 'pretty format'
|
||||||
|
|
Loading…
Reference in a new issue