From 3d2681aea6dc6fba6991f70b16e813d73cbad9db Mon Sep 17 00:00:00 2001 From: John Date: Tue, 20 Sep 2022 14:38:08 -0700 Subject: [PATCH 1/2] Improve callback output to align header with roles, tasks and play RECAP --- plugins/callback/profile_roles.py | 6 +++--- plugins/callback/profile_tasks.py | 5 +++-- plugins/callback/timer.py | 4 +++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/plugins/callback/profile_roles.py b/plugins/callback/profile_roles.py index 13dae0c..5e67ef7 100644 --- a/plugins/callback/profile_roles.py +++ b/plugins/callback/profile_roles.py @@ -102,8 +102,8 @@ class CallbackModule(CallbackBase): self._display.display(tasktime()) def playbook_on_stats(self, stats): - self._display.display(tasktime()) - self._display.display(filled("", fchar="=")) + # Align summary report header with other callback plugin summary + self._display.banner("ROLE RECAP") timestamp(self) total_time = sum(self.totals.values()) @@ -115,4 +115,4 @@ class CallbackModule(CallbackBase): msg_total = u"{0:-<70}{1:->9}".format(u'total ', u' {0:.02f}s'.format(total_time)) self._display.display(filled("", fchar="~")) - self._display.display(msg_total) + self._display.display(msg_total) \ No newline at end of file diff --git a/plugins/callback/profile_tasks.py b/plugins/callback/profile_tasks.py index b7fc3ac..a1d4151 100644 --- a/plugins/callback/profile_tasks.py +++ b/plugins/callback/profile_tasks.py @@ -174,8 +174,8 @@ class CallbackModule(CallbackBase): self._display.display(tasktime()) def playbook_on_stats(self, stats): - self._display.display(tasktime()) - self._display.display(filled("", fchar="=")) + # Align summary report header with other callback plugin summary + self._display.banner("TASKS RECAP") timestamp(self) self.current = None @@ -199,3 +199,4 @@ class CallbackModule(CallbackBase): if 'path' in result: msg += u"\n{0:-<{1}}".format(result['path'] + u' ', self._display.columns) self._display.display(msg) + \ No newline at end of file diff --git a/plugins/callback/timer.py b/plugins/callback/timer.py index 3ef9255..e2eca05 100644 --- a/plugins/callback/timer.py +++ b/plugins/callback/timer.py @@ -46,4 +46,6 @@ class CallbackModule(CallbackBase): def v2_playbook_on_stats(self, stats): end_time = datetime.utcnow() runtime = end_time - self.start_time - self._display.display("Playbook run took %s days, %s hours, %s minutes, %s seconds" % (self.days_hours_minutes_seconds(runtime))) + # 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))) From 3abd029b9f9e094eefe779512367ffab800f1ae4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 21 Sep 2022 08:38:09 -0700 Subject: [PATCH 2/2] Fix missing-final-newline error --- plugins/callback/profile_roles.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/callback/profile_roles.py b/plugins/callback/profile_roles.py index 5e67ef7..23c24c4 100644 --- a/plugins/callback/profile_roles.py +++ b/plugins/callback/profile_roles.py @@ -115,4 +115,5 @@ class CallbackModule(CallbackBase): msg_total = u"{0:-<70}{1:->9}".format(u'total ', u' {0:.02f}s'.format(total_time)) self._display.display(filled("", fchar="~")) - self._display.display(msg_total) \ No newline at end of file + self._display.display(msg_total) + \ No newline at end of file