Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

xep_0199 ping now uses scheduler instead of dedicated thread

  • Loading branch information...
commit b8f40eb8431dd0965d6ed3fd61956f4c91729202 1 parent b73a859
@fritzy fritzy authored
Showing with 6 additions and 6 deletions.
  1. +6 −6 sleekxmpp/plugins/xep_0199.py
View
12 sleekxmpp/plugins/xep_0199.py
@@ -21,7 +21,6 @@ def plugin_init(self):
self.description = "XMPP Ping"
self.xep = "0199"
self.xmpp.add_handler("<iq type='get' xmlns='%s'><ping xmlns='urn:xmpp:ping'/></iq>" % self.xmpp.default_ns, self.handler_ping, name='XMPP Ping')
- self.running = False
if self.config.get('keepalive', True):
self.xmpp.add_event_handler('session_start', self.handler_pingserver, threaded=True)
@@ -30,12 +29,13 @@ def post_init(self):
self.xmpp.plugin['xep_0030'].add_feature('urn:xmpp:ping')
def handler_pingserver(self, xml):
- if not self.running:
- time.sleep(self.config.get('frequency', 300))
- while self.sendPing(self.xmpp.server, self.config.get('timeout', 30)) is not False:
- time.sleep(self.config.get('frequency', 300))
+ self.xmpp.schedule("xep-0119 ping", float(self.config.get('frequency', 300)), self.scheduled_ping, repeat=True)
+
+ def scheduled_ping(self):
+ log.debug("pinging...")
+ if self.sendPing(self.xmpp.server, self.config.get('timeout', 30)) is False:
log.debug("Did not recieve ping back in time. Requesting Reconnect.")
- self.xmpp.disconnect(reconnect=True)
+ self.xmpp.reconnect()
def handler_ping(self, xml):
iq = self.xmpp.makeIqResult(xml.get('id', 'unknown'))
Please sign in to comment.
Something went wrong with that request. Please try again.