diff options
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 8d1c7e36..54da1a85 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -343,7 +343,7 @@ class XMLStream(object): # is established. connected = self.state.transition('disconnected', 'connected', func=self._connect) - while reattempt and not connected: + while reattempt and not connected and not self.stop.is_set(): connected = self.state.transition('disconnected', 'connected', func=self._connect) return connected @@ -439,7 +439,7 @@ class XMLStream(object): self.socket.connect(address) self.send_raw(headers, now=True) resp = '' - while '\r\n\r\n' not in resp: + while '\r\n\r\n' not in resp and not self.stop.is_set(): resp += self.socket.recv(1024).decode('utf-8') log.debug('RECV: %s', resp) @@ -475,7 +475,6 @@ class XMLStream(object): self.session_timeout, _handle_session_timeout) - def disconnect(self, reconnect=False, wait=False): """ Terminate processing and close the XML streams. @@ -496,7 +495,7 @@ class XMLStream(object): wait -- Flag indicating if the send queue should be emptied before disconnecting. """ - self.state.transition('connected', 'disconnected', wait=0.0, + self.state.transition('connected', 'disconnected', func=self._disconnect, args=(reconnect, wait)) def _disconnect(self, reconnect=False, wait=False): @@ -526,20 +525,22 @@ class XMLStream(object): self.event("disconnected", direct=True) return True - def reconnect(self): + def reconnect(self, reattempt=True): """ Reset the stream's state and reconnect to the server. """ log.debug("reconnecting...") - self.state.transition('connected', 'disconnected', wait=2.0, - func=self._disconnect, args=(True,)) + if self.state.ensure('connected'): + self.state.transition('connected', 'disconnected', wait=2.0, + func=self._disconnect, args=(True,)) log.debug("connecting...") connected = self.state.transition('disconnected', 'connected', wait=2.0, func=self._connect) - while not connected: + while reattempt and not connected and not self.stop.is_set(): connected = self.state.transition('disconnected', 'connected', wait=2.0, func=self._connect) + connected = connected or self.state.ensure('connected') return connected def set_socket(self, socket, ignore=False): @@ -1207,7 +1208,10 @@ class XMLStream(object): unhandled = True matched_handlers = [h for h in self.__handlers if h.match(stanza)] for handler in matched_handlers: - stanza_copy = copy.copy(stanza) if len(matched_handlers) > 1 else stanza + if len(matched_handlers) > 1: + stanza_copy = copy.copy(stanza) + else: + stanza_copy = stanza handler.prerun(stanza_copy) self.event_queue.put(('stanza', handler, stanza_copy)) try: |