From 955dadf7431f184f249e7b1903c05f661c232908 Mon Sep 17 00:00:00 2001
From: Chris Church <chris@ninemoreminutes.com>
Date: Fri, 16 May 2014 00:49:11 -0400
Subject: [PATCH] Remove runner_on_error callback that is never used.

---
 lib/ansible/callback_plugins/noop.py |  3 ---
 lib/ansible/callbacks.py             | 19 -------------------
 plugins/callbacks/hipchat.py         |  3 ---
 plugins/callbacks/log_plays.py       |  3 ---
 plugins/callbacks/mail.py            |  6 ------
 plugins/callbacks/osx_say.py         |  3 ---
 6 files changed, 37 deletions(-)

diff --git a/lib/ansible/callback_plugins/noop.py b/lib/ansible/callback_plugins/noop.py
index 5b7cf70562a..b5d5886874c 100644
--- a/lib/ansible/callback_plugins/noop.py
+++ b/lib/ansible/callback_plugins/noop.py
@@ -41,9 +41,6 @@ class CallbackModule(object):
     def runner_on_ok(self, host, res):
         pass
 
-    def runner_on_error(self, host, msg):
-        pass
-
     def runner_on_skipped(self, host, item=None):
         pass
 
diff --git a/lib/ansible/callbacks.py b/lib/ansible/callbacks.py
index 78ff3ced995..db1e3eedf3e 100644
--- a/lib/ansible/callbacks.py
+++ b/lib/ansible/callbacks.py
@@ -343,9 +343,6 @@ class DefaultRunnerCallbacks(object):
     def on_ok(self, host, res):
         call_callback_module('runner_on_ok', host, res)
 
-    def on_error(self, host, msg):
-        call_callback_module('runner_on_error', host, msg)
-
     def on_skipped(self, host, item=None):
         call_callback_module('runner_on_skipped', host, item=item)
 
@@ -404,10 +401,6 @@ class CliRunnerCallbacks(DefaultRunnerCallbacks):
         display("%s | skipped" % (host), runner=self.runner)
         super(CliRunnerCallbacks, self).on_skipped(host, item)
 
-    def on_error(self, host, err):
-        display("err: [%s] => %s\n" % (host, err), stderr=True, runner=self.runner)
-        super(CliRunnerCallbacks, self).on_error(host, err)
-
     def on_no_hosts(self):
         display("no hosts matched\n", stderr=True, runner=self.runner)
         super(CliRunnerCallbacks, self).on_no_hosts()
@@ -534,18 +527,6 @@ class PlaybookRunnerCallbacks(DefaultRunnerCallbacks):
                 display(msg, color='yellow', runner=self.runner)
         super(PlaybookRunnerCallbacks, self).on_ok(host, host_result)
 
-    def on_error(self, host, err):
-
-        item = err.get('item', None)
-        msg = ''
-        if item:
-            msg = "err: [%s] => (item=%s) => %s" % (host, item, err)
-        else:
-            msg = "err: [%s] => %s" % (host, err)
-
-        display(msg, color='red', stderr=True, runner=self.runner)
-        super(PlaybookRunnerCallbacks, self).on_error(host, err)
-
     def on_skipped(self, host, item=None):
         if constants.DISPLAY_SKIPPED_HOSTS:
             msg = ''
diff --git a/plugins/callbacks/hipchat.py b/plugins/callbacks/hipchat.py
index a5acf9194ea..6447a01e753 100644
--- a/plugins/callbacks/hipchat.py
+++ b/plugins/callbacks/hipchat.py
@@ -91,9 +91,6 @@ class CallbackModule(object):
     def runner_on_ok(self, host, res):
         pass
 
-    def runner_on_error(self, host, msg):
-        pass
-
     def runner_on_skipped(self, host, item=None):
         pass
 
diff --git a/plugins/callbacks/log_plays.py b/plugins/callbacks/log_plays.py
index 8f037d6b1a3..f329ce83b1c 100644
--- a/plugins/callbacks/log_plays.py
+++ b/plugins/callbacks/log_plays.py
@@ -63,9 +63,6 @@ class CallbackModule(object):
     def runner_on_ok(self, host, res):
         log(host, 'OK', res)
 
-    def runner_on_error(self, host, msg):
-        log(host, 'ERROR', msg)
-
     def runner_on_skipped(self, host, item=None):
         log(host, 'SKIPPED', '...')
 
diff --git a/plugins/callbacks/mail.py b/plugins/callbacks/mail.py
index 2281150f2c4..ce1cda39429 100644
--- a/plugins/callbacks/mail.py
+++ b/plugins/callbacks/mail.py
@@ -66,12 +66,6 @@ class CallbackModule(object):
         body += 'A complete dump of the error:\n\n' + str(res)
         mail(sender=sender, subject=subject, body=body)
                   
-    def runner_on_error(self, host, msg):
-        sender = '"Ansible: %s" <root>' % host
-        subject = 'Error: %s' % msg.strip('\r\n').split('\n')[0]
-        body = 'An error occured for host ' + host + ' with the following message:\n\n' + msg
-        mail(sender=sender, subject=subject, body=body)
-
     def runner_on_unreachable(self, host, res):
         sender = '"Ansible: %s" <root>' % host
         if isinstance(res, basestring):
diff --git a/plugins/callbacks/osx_say.py b/plugins/callbacks/osx_say.py
index ec1f32bace9..95a3f0d8357 100644
--- a/plugins/callbacks/osx_say.py
+++ b/plugins/callbacks/osx_say.py
@@ -49,9 +49,6 @@ class CallbackModule(object):
     def runner_on_ok(self, host, res):
         say("pew", LASER_VOICE)
 
-    def runner_on_error(self, host, msg):
-        pass
-
     def runner_on_skipped(self, host, item=None):
         say("pew", LASER_VOICE)