@@ -1,11 +1,9 @@ #!/usr/bin/env python -from twisted.internet import task from twisted.words.xish import domish from twisted.words.protocols.jabber.jid import JID from wokkel.xmppim import MessageProtocol, PresenceClientProtocol from wokkel.xmppim import AvailablePresence -from wokkel.client import XMPPHandler import xmpp_commands import config @@ -136,21 +134,3 @@ But I can do more. Type "help" for more info. self.unsubscribe(entity) self.unsubscribed(entity) self.update_presence() - -# From https://mailman.ik.nu/pipermail/twisted-jabber/2008-October/000171.html -class KeepAlive(XMPPHandler): - - interval = 300 - lc = None - - def connectionInitialized(self): - self.lc = task.LoopingCall(self.ping) - self.lc.start(self.interval) - - def connectionLost(self, *args): - if self.lc: - self.lc.stop() - - def ping(self): - print "Stayin' alive" - self.send(" ") lib/whatsup/protocol.py @@ -7,6 +7,7 @@ from twisted.internet import task, reactor from twisted.words.protocols.jabber import jid from wokkel.client import XMPPClient from wokkel.generic import VersionHandler +from wokkel.keepalive import KeepAlive from whatsup import config from whatsup import protocol @@ -20,7 +21,7 @@ xmppclient.logTraffic = False whatsup=protocol.WhatsupProtocol() whatsup.setHandlerParent(xmppclient) VersionHandler('Whatsup', config.VERSION).setHandlerParent(xmppclient) -protocol.KeepAlive().setHandlerParent(xmppclient) +KeepAlive().setHandlerParent(xmppclient) xmppclient.setServiceParent(application) site_checker = scheduling.CheckSites(whatsup) whatsup.tac 51e9fb4ba3779e350961e5b9a4cd3e4be526de75 Dustin Sallings dustin@spy.net http://github.com/dustin/whatsup/commit/e8534eecce95b81e5436951126633261e42b3a2f e8534eecce95b81e5436951126633261e42b3a2f 2008-12-24T14:22:54-08:00 2008-12-24T14:22:54-08:00 Use wokkel's whitespace keepalive. 08ac4015fc7f6a8c8059e1d0ea399f95e2da1216 Dustin Sallings dustin@spy.net