Merge lp:~pconnell/endroid/pinger into lp:endroid

[Phil Connell]

Improve reliability of periodic pinger

- Handle failures in wokkel/twisted (endroid bug 1380972)
- Log async errors for triageability
- Use addCallbacks so that errback is actually called!

[lp:~pconnell/endroid/pinger]

99. By Phil Connell <email address hidden> on 2014-10-14

Remove dead comment

100. By Phil Connell <email address hidden> on 2014-10-14

Log messages from twisted, rather than letting them go to stderr

101. By Phil Connell <email address hidden> on 2014-10-14

Log StanzaErrors from pings as debug, to handle bad servers

102. By Phil Connell <email address hidden> on 2014-10-14

Tag 1.4.6

Unmerged revisions

=== modified file 'src/endroid/plugins/periodicpinger.py'
--- src/endroid/plugins/periodicpinger.py	2014-10-02 12:51:59 +0000
+++ src/endroid/plugins/periodicpinger.py	2014-10-14 09:55:41 +0000
@@ -12,6 +12,7 @@
 
 
 import logging
+import functools
 import itertools
 
 import twisted.internet.task
@@ -64,16 +65,14 @@
 
         for server in self.servers:
             def _fail(fail, server):
-                # If the server returns an error then we don't really care, 
-                # since all we want to do is ensure server-to-server 
-                # connections are kept open by sending ping traffic and we have 
-                # achieved this. So just log for debugging purposes.
-                logging.debug("Failed to ping {}: {}"
-                              .format(server, str(fail.value)))
+                self.log.error(
+                    "Failed to ping {}: {}".format(server, str(fail.value)))
             def _success(response):
                 pass
-            d = self.usermanagement.ping(server)
-            d.addCallback(_success)
-            d.addErrback(_fail, server)
+            try:
+                d = self.usermanagement.ping(server)
+            except Exception:
+                self.log.exception("Failed to send ping to {}:".format(server))
+            d.addCallbacks(_success, functools.partial(_fail, server=server))