Skip to content
Browse files

misc small tweaks

  • Loading branch information...
1 parent c4699b9 commit d88999691cd36fa9049f8bda522d394d81ba1365 @fritzy committed Oct 20, 2010
Showing with 5 additions and 3 deletions.
  1. +1 −1 sleekxmpp/clientxmpp.py
  2. +1 −1 sleekxmpp/xmlstream/scheduler.py
  3. +3 −1 sleekxmpp/xmlstream/xmlstream.py
View
2 sleekxmpp/clientxmpp.py
@@ -357,8 +357,8 @@ def _handle_auth_fail(self, xml):
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):
"""
View
2 sleekxmpp/xmlstream/scheduler.py
@@ -174,7 +174,7 @@ def _process(self):
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))
View
4 sleekxmpp/xmlstream/xmlstream.py
@@ -331,6 +331,7 @@ def reconnect(self):
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 @@ def _process(self):
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:

0 comments on commit d889996

Please sign in to comment.
Something went wrong with that request. Please try again.