jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reconnect if session isn't established within 15 seconds

Browse Source
This commit is contained in:
Nathan Fritz
2010-10-20 19:18:27 -07:00
parent 11264fe0a8
commit 77eab6544f
4 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sleekxmpp/xmlstream/scheduler.py
View File

@@ -137,7 +137,7 @@ class Scheduler(object):
"""Process scheduled tasks."""
self.run = True
try:
while self.run:
while self.run and (self.parentstop is None or not self.parentstop.isSet()):
wait = 1
updated = False
if self.schedule:
@@ -168,6 +168,7 @@ class Scheduler(object):
except KeyboardInterrupt:
self.run = False
if self.parentstop is not None:
logging.debug("stopping parent")
self.parentstop.set()
except SystemExit:
self.run = False

7
sleekxmpp/xmlstream/xmlstream.py
View File

@@ -275,6 +275,7 @@ class XMLStream(object):
self.socket = ssl_socket
try:
logging.debug("Connecting to %s:%s" % self.address)
self.socket.connect(self.address)
self.set_socket(self.socket, ignore=True)
#this event is where you should set your application state
@@ -328,10 +329,10 @@ class XMLStream(object):
Reset the stream's state and reconnect to the server.
"""
logging.debug("reconnecting...")
self.state.transition('connected', 'disconnected', wait=0.0,
self.state.transition('connected', 'disconnected', wait=2.0,
func=self._disconnect, args=(True,))
return self.state.transition('disconnected', 'connected',
wait=0.0, func=self._connect)
wait=2.0, func=self._connect)
def set_socket(self, socket, ignore=False):
"""
@@ -669,7 +670,7 @@ class XMLStream(object):
# The body of this loop will only execute once per connection.
# Additional passes will be made only if an error occurs and
# reconnecting is permitted.
while not self.stop.isSet() and firstrun or self.auto_reconnect:
while firstrun or (self.auto_reconnect and not self.stop.isSet()):
firstrun = False
try:
if self.is_client: