Commit d8899969 authored by Nathan Fritz's avatar Nathan Fritz

misc small tweaks

parent c4699b92
......@@ -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):
"""
......
......@@ -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))
......
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment