From 7a1bce1b5de396a4bdb16c584f177859090ad175 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Fri, 10 Jul 2015 23:48:12 -0400 Subject: [PATCH] added verbose option to show callback loaded info also made mail module print nicer without all those 'u' --- lib/ansible/plugins/callback/__init__.py | 7 ++++++- lib/ansible/plugins/callback/context_demo.py | 1 + lib/ansible/plugins/callback/default.py | 1 + lib/ansible/plugins/callback/hipchat.py | 3 ++- lib/ansible/plugins/callback/log_plays.py | 1 + lib/ansible/plugins/callback/mail.py | 10 +++++++--- lib/ansible/plugins/callback/minimal.py | 1 + lib/ansible/plugins/callback/osx_say.py | 1 + lib/ansible/plugins/callback/syslog_json.py | 1 + lib/ansible/plugins/callback/timer.py | 1 + 10 files changed, 22 insertions(+), 5 deletions(-) diff --git a/lib/ansible/plugins/callback/__init__.py b/lib/ansible/plugins/callback/__init__.py index 776ad15717b..17a6606fb87 100644 --- a/lib/ansible/plugins/callback/__init__.py +++ b/lib/ansible/plugins/callback/__init__.py @@ -16,7 +16,7 @@ # along with Ansible. If not, see . # Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) +from __future__ import (absolute_import, division) __metaclass__ = type __all__ = ["CallbackBase"] @@ -34,6 +34,11 @@ class CallbackBase: def __init__(self, display): self._display = display + if self._display.verbosity >= 4: + name = getattr(self, 'CALLBACK_NAME', 'with no defined name') + ctype = getattr(self, 'CALLBACK_TYPE', 'unknwon') + version = getattr(self, 'CALLBACK_VERSION', 'unknwon') + self._display.vvvv('Loaded callback %s of type %s, v%s' % (name, ctype, version)) def set_connection_info(self, conn_info): pass diff --git a/lib/ansible/plugins/callback/context_demo.py b/lib/ansible/plugins/callback/context_demo.py index f204ecb3bed..ad22ead07df 100644 --- a/lib/ansible/plugins/callback/context_demo.py +++ b/lib/ansible/plugins/callback/context_demo.py @@ -24,6 +24,7 @@ class CallbackModule(CallbackBase): """ CALLBACK_VERSION = 2.0 CALLBACK_TYPE = 'aggregate' + CALLBACK_TYPE = 'context_demo' def v2_on_any(self, *args, **kwargs): i = 0 diff --git a/lib/ansible/plugins/callback/default.py b/lib/ansible/plugins/callback/default.py index 2c4a8cea88b..00ba9c72c86 100644 --- a/lib/ansible/plugins/callback/default.py +++ b/lib/ansible/plugins/callback/default.py @@ -32,6 +32,7 @@ class CallbackModule(CallbackBase): CALLBACK_VERSION = 2.0 CALLBACK_TYPE = 'stdout' + CALLBACK_NAME = 'default' def v2_runner_on_failed(self, result, ignore_errors=False): if 'exception' in result._result: diff --git a/lib/ansible/plugins/callback/hipchat.py b/lib/ansible/plugins/callback/hipchat.py index a2709e3d5b9..b0d1bfb67e6 100644 --- a/lib/ansible/plugins/callback/hipchat.py +++ b/lib/ansible/plugins/callback/hipchat.py @@ -42,7 +42,8 @@ class CallbackModule(CallbackBase): """ CALLBACK_VERSION = 2.0 - CALLBACK_TYPE = 'notification' + CALLBACK_VERSION = 2.0 + CALLBACK_NAME = 'hipchat' def __init__(self, display): diff --git a/lib/ansible/plugins/callback/log_plays.py b/lib/ansible/plugins/callback/log_plays.py index 65036e6763b..7cdedcb00e3 100644 --- a/lib/ansible/plugins/callback/log_plays.py +++ b/lib/ansible/plugins/callback/log_plays.py @@ -34,6 +34,7 @@ class CallbackModule(CallbackBase): """ CALLBACK_VERSION = 2.0 CALLBACK_TYPE = 'notification' + CALLBACK_NAME = 'log_plays' TIME_FORMAT="%b %d %Y %H:%M:%S" MSG_FORMAT="%(now)s - %(category)s - %(data)s\n\n" diff --git a/lib/ansible/plugins/callback/mail.py b/lib/ansible/plugins/callback/mail.py index c82acdf2fcb..af86e61df9c 100644 --- a/lib/ansible/plugins/callback/mail.py +++ b/lib/ansible/plugins/callback/mail.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- # Copyright 2012 Dag Wieers # # This file is part of Ansible @@ -17,6 +18,7 @@ import os import smtplib +import json from ansible.plugins.callback import CallbackBase def mail(subject='Ansible error mail', sender=None, to=None, cc=None, bcc=None, body=None, smtphost=None): @@ -58,6 +60,7 @@ class CallbackModule(CallbackBase): """ CALLBACK_VERSION = 2.0 CALLBACK_TYPE = 'notification' + CALLBACK_NAME = 'mail' def v2_runner_on_failed(self, res, ignore_errors=False): @@ -66,8 +69,9 @@ class CallbackModule(CallbackBase): if ignore_errors: return sender = '"Ansible: %s" ' % host - subject = 'Failed: %s' % (res._task.action) - body = 'The following task failed for host ' + host + ':\n\n%s\n\n' % (res._task.action) + attach = "%s: %s" % (res._result['invocation']['module_name'], json.dumps(res._result['invocation']['module_args'])) + subject = 'Failed: %s' % attach + body = 'The following task failed for host ' + host + ':\n\n%s\n\n' % attach if 'stdout' in res._result.keys() and res._result['stdout']: subject = res._result['stdout'].strip('\r\n').split('\n')[-1] @@ -78,7 +82,7 @@ class CallbackModule(CallbackBase): if 'msg' in res._result.keys() and res._result['msg']: subject = res._result['msg'].strip('\r\n').split('\n')[0] body += 'with the following message:\n\n' + res._result['msg'] + '\n\n' - body += 'A complete dump of the error:\n\n' + str(res._result['msg']) + body += 'A complete dump of the error:\n\n' + json.dumps(res._result, indent=4) mail(sender=sender, subject=subject, body=body) def v2_runner_on_unreachable(self, result): diff --git a/lib/ansible/plugins/callback/minimal.py b/lib/ansible/plugins/callback/minimal.py index d0c314e1b90..d5950fae011 100644 --- a/lib/ansible/plugins/callback/minimal.py +++ b/lib/ansible/plugins/callback/minimal.py @@ -33,6 +33,7 @@ class CallbackModule(CallbackBase): CALLBACK_VERSION = 2.0 CALLBACK_TYPE = 'stdout' + CALLBACK_NAME = 'minimal' def v2_on_any(self, *args, **kwargs): pass diff --git a/lib/ansible/plugins/callback/osx_say.py b/lib/ansible/plugins/callback/osx_say.py index bb785b3872f..36b053026e2 100644 --- a/lib/ansible/plugins/callback/osx_say.py +++ b/lib/ansible/plugins/callback/osx_say.py @@ -33,6 +33,7 @@ class CallbackModule(CallbackBase): """ CALLBACK_VERSION = 2.0 CALLBACK_TYPE = 'notification' + CALLBACK_NAME = 'osx_say' def __init__(self, display): diff --git a/lib/ansible/plugins/callback/syslog_json.py b/lib/ansible/plugins/callback/syslog_json.py index 3be64ee154c..fe0281b780b 100644 --- a/lib/ansible/plugins/callback/syslog_json.py +++ b/lib/ansible/plugins/callback/syslog_json.py @@ -21,6 +21,7 @@ class CallbackModule(CallbackBase): """ CALLBACK_VERSION = 2.0 CALLBACK_TYPE = 'aggregate' + CALLBACK_NAME = 'syslog_json' def __init__(self, display): diff --git a/lib/ansible/plugins/callback/timer.py b/lib/ansible/plugins/callback/timer.py index d7f2b42a964..058cb4f4a4d 100644 --- a/lib/ansible/plugins/callback/timer.py +++ b/lib/ansible/plugins/callback/timer.py @@ -10,6 +10,7 @@ class CallbackModule(CallbackBase): """ CALLBACK_VERSION = 2.0 CALLBACK_TYPE = 'aggregate' + CALLBACK_NAME = 'timer' start_time = datetime.now()