summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Fritz <nathan@andyet.net>2011-02-15 15:24:58 -0800
committerNathan Fritz <nathan@andyet.net>2011-02-15 15:24:58 -0800
commit2e2e16e281be81e4f19e45021fe23fb3196ada83 (patch)
tree3ff042ddfd9a9ffdb0587565018db7bc04c4ee5e
parentd709f8db657aa1d1314082d842dd29e2546739c4 (diff)
downloadslixmpp-2e2e16e281be81e4f19e45021fe23fb3196ada83.tar.gz
slixmpp-2e2e16e281be81e4f19e45021fe23fb3196ada83.tar.bz2
slixmpp-2e2e16e281be81e4f19e45021fe23fb3196ada83.tar.xz
slixmpp-2e2e16e281be81e4f19e45021fe23fb3196ada83.zip
fixes to ping: auto-ping off by default, fixed ping-time of zero bug, fixed class name mismatch
-rw-r--r--sleekxmpp/plugins/xep_0199/ping.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/sleekxmpp/plugins/xep_0199/ping.py b/sleekxmpp/plugins/xep_0199/ping.py
index 064af4ca..d1e08e61 100644
--- a/sleekxmpp/plugins/xep_0199/ping.py
+++ b/sleekxmpp/plugins/xep_0199/ping.py
@@ -54,7 +54,7 @@ class xep_0199(base_plugin):
self.xep = '0199'
self.stanza = stanza
- self.keepalive = self.config.get('keepalive', True)
+ self.keepalive = self.config.get('keepalive', False)
self.frequency = float(self.config.get('frequency', 300))
self.timeout = self.config.get('timeout', 30)
@@ -90,7 +90,7 @@ class xep_0199(base_plugin):
"""Send ping request to the server."""
log.debug("Pinging...")
resp = self.send_ping(self.xmpp.boundjid.host, self.timeout)
- if not resp:
+ if resp is None or resp is False:
log.debug("Did not recieve ping back in time." + \
"Requesting Reconnect.")
self.xmpp.reconnect()
@@ -160,4 +160,4 @@ class xep_0199(base_plugin):
# Backwards compatibility for names
-Ping.sendPing = Ping.send_ping
+xep_0199.sendPing = xep_0199.send_ping