@@ -13,6 +13,7 @@ from twisted.protocols import memcache from wokkel.xmppim import MessageProtocol, PresenceClientProtocol from wokkel.xmppim import AvailablePresence +from wokkel import ping import xmpp_commands import config @@ -83,19 +84,15 @@ class TwitterspyMessageProtocol(MessageProtocol): return prefix + str(self._pubid) def ping(self, fromjid, tojid): - iq = IQ(self.xmlstream, 'get') - iq['from'] = config.SCREEN_NAME - iq['to'] = tojid - iq.addElement(("urn:xmpp:ping", 'ping')) - d = iq.send() - start_time = time.time() - log.msg("Sending ping %s" % iq.toXml()) + p = ping.Ping(self.xmlstream, config.SCREEN_NAME, tojid) + d = p.send() + log.msg("Sending ping %s" % p.toXml()) def _gotPing(x): - duration = time.time() - start_time + duration = time.time() - p.start_time log.msg("pong %s" % tojid) self.send_plain(fromjid, "Pong (%s) - %fs" % (tojid, duration)) def _gotError(x): - duration = time.time() - start_time + duration = time.time() - p.start_time log.msg("Got an error pinging %s: %s" % (tojid, x)) self.send_plain(fromjid, "Error pinging %s (%fs): %s" % (tojid, duration, x)) d.addCallback(_gotPing) lib/twitterspy/protocol.py @@ -1 +1 @@ -Subproject commit 2ce0add5793051f841b502f99caff1c251c0ad05 +Subproject commit 18796ca973db33d65bf3a6653c95d715e0c82a79 lib/wokkel ec248e77ac1556d09f5f17d1620de47ede9aea95 Dustin Sallings dustin@spy.net http://github.com/dustin/twitterspy/commit/54260001ed85e77fda3d6a8bda0e2d96e1e81111 54260001ed85e77fda3d6a8bda0e2d96e1e81111 2009-01-05T20:59:37-08:00 2009-01-05T19:52:06-08:00 Use ping message from wokkel instead of handcrafting one. d6b8d556d89aa4fb9afd614839eb60c0f19e3c00 Dustin Sallings dustin@spy.net