From d88999691cd36fa9049f8bda522d394d81ba1365 Mon Sep 17 00:00:00 2001
From: Nathan Fritz <nathan@andyet.net>
Date: Wed, 20 Oct 2010 20:14:26 -0700
Subject: misc small tweaks

---
 sleekxmpp/clientxmpp.py          | 2 +-
 sleekxmpp/xmlstream/scheduler.py | 2 +-
 sleekxmpp/xmlstream/xmlstream.py | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'sleekxmpp')

diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index 6a10a52f..c3963af7 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -357,8 +357,8 @@ class ClientXMPP(BaseXMPP):
             xml -- The SASL authentication failure element.
         """
         logging.info("Authentication failed.")
+        self.event("failed_auth", direct=True)
         self.disconnect()
-        self.event("failed_auth")
 
     def _handle_bind_resource(self, xml):
         """
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:
-- 
cgit v1.2.3