diff options
author | Lance Stout <lancestout@gmail.com> | 2011-02-24 16:19:35 -0500 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-02-24 16:19:35 -0500 |
commit | c2161ca56b4c9c1ce8dabd32ed36cd4902b4eefc (patch) | |
tree | 500caa5f1ebaaf24044b4c81ed03d63ee464572c /sleekxmpp/plugins/xep_0199 | |
parent | d5b3a5282763e4f74816ff392bd8cd47dd9f7a95 (diff) | |
parent | 45ccb313560fbfbc0354ebac9116ecb9ff963a47 (diff) | |
download | slixmpp-c2161ca56b4c9c1ce8dabd32ed36cd4902b4eefc.tar.gz slixmpp-c2161ca56b4c9c1ce8dabd32ed36cd4902b4eefc.tar.bz2 slixmpp-c2161ca56b4c9c1ce8dabd32ed36cd4902b4eefc.tar.xz slixmpp-c2161ca56b4c9c1ce8dabd32ed36cd4902b4eefc.zip |
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp/plugins/xep_0199')
-rw-r--r-- | sleekxmpp/plugins/xep_0199/ping.py | 6 |
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 |