From 3a085b0b10e33395630733d4368d408fc781a48d Mon Sep 17 00:00:00 2001 From: Hideki Saito Date: Wed, 9 Oct 2024 15:32:45 +0900 Subject: [PATCH] Revert "Merge pull request #387 from ansiblejunky/fix-callback-output" This reverts commit f4baa4c6d8e5ec989887a2b5f4abde24c9e12cbb, reversing changes made to 0821768bcbac58ace4fdf0c95b89007a925d6556. --- changelogs/fragments/387_callback_output_header.yml | 3 --- plugins/callback/profile_roles.py | 5 +---- plugins/callback/profile_tasks.py | 5 +---- plugins/callback/timer.py | 4 +--- 4 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 changelogs/fragments/387_callback_output_header.yml diff --git a/changelogs/fragments/387_callback_output_header.yml b/changelogs/fragments/387_callback_output_header.yml deleted file mode 100644 index 5eb8573..0000000 --- a/changelogs/fragments/387_callback_output_header.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -minor_changes: - - callback plugins - Add recap information to timer, profile_roles and profile_tasks callback outputs (https://github.com/ansible-collections/ansible.posix/pull/387). diff --git a/plugins/callback/profile_roles.py b/plugins/callback/profile_roles.py index 270a74f..59a437f 100644 --- a/plugins/callback/profile_roles.py +++ b/plugins/callback/profile_roles.py @@ -128,10 +128,7 @@ class CallbackModule(CallbackBase): self._display_tasktime() def playbook_on_stats(self, stats): - # Align summary report header with other callback plugin summary - self._display.banner("ROLES RECAP") - - self._display.display(tasktime()) + self._display_tasktime() self._display.display(filled("", fchar="=")) timestamp(self) diff --git a/plugins/callback/profile_tasks.py b/plugins/callback/profile_tasks.py index c5cc5fe..5fb7972 100644 --- a/plugins/callback/profile_tasks.py +++ b/plugins/callback/profile_tasks.py @@ -193,10 +193,7 @@ class CallbackModule(CallbackBase): self._display_tasktime() def playbook_on_stats(self, stats): - # Align summary report header with other callback plugin summary - self._display.banner("TASKS RECAP") - - self._display.display(tasktime()) + self._display_tasktime() self._display.display(filled("", fchar="=")) timestamp(self) diff --git a/plugins/callback/timer.py b/plugins/callback/timer.py index e2eca05..3ef9255 100644 --- a/plugins/callback/timer.py +++ b/plugins/callback/timer.py @@ -46,6 +46,4 @@ class CallbackModule(CallbackBase): def v2_playbook_on_stats(self, stats): end_time = datetime.utcnow() runtime = end_time - self.start_time - # Align summary report header with other callback plugin summary - self._display.banner("PLAYBOOK RECAP") - self._display.display("Playbook run took %s days, %s hours, %s minutes, %s seconds\n\r" % (self.days_hours_minutes_seconds(runtime))) + self._display.display("Playbook run took %s days, %s hours, %s minutes, %s seconds" % (self.days_hours_minutes_seconds(runtime)))