summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/xmlstream.py
diff options
context:
space:
mode:
authorNathan Fritz <nathan@andyet.net>2010-10-20 20:14:26 -0700
committerNathan Fritz <nathan@andyet.net>2010-10-20 20:14:26 -0700
commitd88999691cd36fa9049f8bda522d394d81ba1365 (patch)
tree72b3f38e99ef3c03d6a5975188daae7e1c90f103 /sleekxmpp/xmlstream/xmlstream.py
parentc4699b92e6c61f8fe89cb114fecab1395d9127ef (diff)
downloadslixmpp-d88999691cd36fa9049f8bda522d394d81ba1365.tar.gz
slixmpp-d88999691cd36fa9049f8bda522d394d81ba1365.tar.bz2
slixmpp-d88999691cd36fa9049f8bda522d394d81ba1365.tar.xz
slixmpp-d88999691cd36fa9049f8bda522d394d81ba1365.zip
misc small tweakssleek-1.0-Beta11.0-Beta1
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index c8280c33..e11497f2 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -331,6 +331,7 @@ class XMLStream(object):
logging.debug("reconnecting...")
self.state.transition('connected', 'disconnected', wait=2.0,
func=self._disconnect, args=(True,))
+ logging.debug("connecting...")
return self.state.transition('disconnected', 'connected',
wait=2.0, func=self._connect)
@@ -693,7 +694,8 @@ class XMLStream(object):
except Socket.error:
logging.exception('Socket Error')
except:
- logging.exception('Connection error. Reconnecting.')
+ if not self.stop.isSet():
+ logging.exception('Connection error.')
if not self.stop.isSet() and self.auto_reconnect:
self.reconnect()
else: