summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
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
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')
-rw-r--r--sleekxmpp/xmlstream/scheduler.py2
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/sleekxmpp/xmlstream/scheduler.py b/sleekxmpp/xmlstream/scheduler.py
index b1b81439..240d4a4b 100644
--- a/sleekxmpp/xmlstream/scheduler.py
+++ b/sleekxmpp/xmlstream/scheduler.py
@@ -174,7 +174,7 @@ class Scheduler(object):
self.run = False
if self.parentstop is not None:
self.parentstop.set()
- logging.debug("Qutting Scheduler thread")
+ logging.debug("Quitting Scheduler thread")
if self.parentqueue is not None:
self.parentqueue.put(('quit', None, None))
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: