summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
diff options
context:
space:
mode:
authorTom Nichols <tmnichols@gmail.com>2010-07-02 17:14:37 -0400
committerTom Nichols <tmnichols@gmail.com>2010-07-02 17:14:37 -0400
commitd381ab320aa8c285d80b0384c8bbaf461639e366 (patch)
treec1cf237a19958313146018495a0844170641b0f1 /sleekxmpp/xmlstream
parent6e93982fdf9c66673ad298148beaefc725f9440c (diff)
parent4b00baab1e99efe0a075116337422da4eb18b37f (diff)
downloadslixmpp-d381ab320aa8c285d80b0384c8bbaf461639e366.tar.gz
slixmpp-d381ab320aa8c285d80b0384c8bbaf461639e366.tar.bz2
slixmpp-d381ab320aa8c285d80b0384c8bbaf461639e366.tar.xz
slixmpp-d381ab320aa8c285d80b0384c8bbaf461639e366.zip
merged changes from origin/hacks
Diffstat (limited to 'sleekxmpp/xmlstream')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index a464da0d..88ec219c 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -226,7 +226,6 @@ class XMLStream(object):
# TODO currently this will re-send a stream header if this exception occurs.
# I don't think that's intended behavior.
logging.warn('socket rcv timeout')
- pass
except RestartStream:
logging.debug("Restarting stream...")
continue # DON'T re-initialize the stream -- this exception is sent
@@ -238,22 +237,16 @@ class XMLStream(object):
except:
logging.exception('Unexpected error in RCV thread')
- # if the RCV socket is terminated for whatever reason, our only sane choice of action is an attempt
- # to re-establish the connection.
+ # 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.
if not self.quit.is_set():
logging.info( 'about to reconnect..........' )
- logging.info( 'about to reconnect..........' )
- logging.info( 'about to reconnect..........' )
- logging.info( 'about to reconnect..........' )
try:
self.disconnect(reconnect=self.should_reconnect, error=True)
except:
logging.exception( "WTF disconnect!" )
logging.info( 'reconnect complete!' )
logging.info( 'reconnect complete!' )
- logging.info( 'reconnect complete!' )
- logging.info( 'reconnect complete!' )
- logging.info( 'reconnect complete!' )
logging.debug('Quitting Process thread')
@@ -322,9 +315,7 @@ class XMLStream(object):
return True
def disconnect(self, reconnect=False, error=False):
- logging.info('AAAAAAAAAAAAAAAAAAAAAAAA')
with self.state.transition_ctx('connected','disconnected') as locked:
- logging.info('BBBBBBBBBBBBBBBBBBBBBBBBBB')
if not locked:
logging.warning("Already disconnected.")
return