From 658ea053ea0727165a27dbb9120e291b559405b1 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 3 Nov 2015 08:20:13 -0800 Subject: [PATCH] Cleanup timer callback plugin's overwriting of modules it imported --- lib/ansible/plugins/callback/timer.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/ansible/plugins/callback/timer.py b/lib/ansible/plugins/callback/timer.py index 8694b281e70..ba6bbe86823 100644 --- a/lib/ansible/plugins/callback/timer.py +++ b/lib/ansible/plugins/callback/timer.py @@ -2,12 +2,11 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import os -import datetime -from datetime import datetime, timedelta +from datetime import datetime from ansible.plugins.callback import CallbackBase + class CallbackModule(CallbackBase): """ This callback module tells you how long your plays ran for. @@ -22,16 +21,15 @@ class CallbackModule(CallbackBase): self.start_time = datetime.now() - def days_hours_minutes_seconds(self, timedelta): - minutes = (timedelta.seconds//60)%60 - r_seconds = timedelta.seconds - (minutes * 60) - return timedelta.days, timedelta.seconds//3600, minutes, r_seconds + def days_hours_minutes_seconds(self, runtime): + minutes = (runtime.seconds // 60) % 60 + r_seconds = runtime.seconds - (minutes * 60) + return runtime.days, runtime.seconds // 3600, minutes, r_seconds def playbook_on_stats(self, stats): self.v2_playbook_on_stats(stats) def v2_playbook_on_stats(self, stats): end_time = datetime.now() - timedelta = end_time - self.start_time - self._display.display("Playbook run took %s days, %s hours, %s minutes, %s seconds" % (self.days_hours_minutes_seconds(timedelta))) - + 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)))