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

cleaned up disconnect/reconnect logic just a little

Browse Source
This commit is contained in:
Thom Nichols 2010-07-02 18:05:50 -04:00
parent d381ab320a
commit 0a30e6c017
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sleekxmpp/xmlstream/xmlstream.py
View File

@ -219,7 +219,6 @@ class XMLStream(object):
while not self.quit.is_set(): while not self.quit.is_set():
if not self.state.ensure('connected',wait=2, block_on_transition=True): continue if not self.state.ensure('connected',wait=2, block_on_transition=True): continue
try: try:
logging.debug(' ------------------------------- starting process loop...')
self.sendPriorityRaw(self.stream_header) self.sendPriorityRaw(self.stream_header)
self.__readXML() # this loops until the stream is terminated. self.__readXML() # this loops until the stream is terminated.
except socket.timeout: except socket.timeout:
@ -239,15 +238,9 @@ class XMLStream(object):
# if the RCV socket is terminated for whatever reason (e.g. we reach this point of # if the RCV socket is terminated for whatever reason (e.g. we reach this point of
# code,) our only sane choice of action is an attempt to re-establish the connection. # code,) our only sane choice of action is an attempt to re-establish the connection.
if not self.quit.is_set(): reconnect = (self.should_reconnect and not self.quit.is_set())
logging.info( 'about to reconnect..........' ) self.disconnect(reconnect=reconnect, error=True)
try:
self.disconnect(reconnect=self.should_reconnect, error=True)
except:
logging.exception( "WTF disconnect!" )
logging.info( 'reconnect complete!' )
logging.info( 'reconnect complete!' )
logging.debug('Quitting Process thread') logging.debug('Quitting Process thread')
def __readXML(self): def __readXML(self):
@ -303,8 +296,8 @@ class XMLStream(object):
# the same thing concurrently. Oops! The safer option would be to throw # the same thing concurrently. Oops! The safer option would be to throw
# some sort of event that could be handled by a common thread or the reader # some sort of event that could be handled by a common thread or the reader
# thread to perform reconnect and then re-initialize the handler threads as well. # thread to perform reconnect and then re-initialize the handler threads as well.
if self.should_reconnect: reconnect = (self.should_reconnect and not self.quit.is_set())
self.disconnect(reconnect=True, error=True) self.disconnect(reconnect=reconnect, error=True)
def sendRaw(self, data): def sendRaw(self, data):
self.sendqueue.put((1, data)) self.sendqueue.put((1, data))