jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for the stop event more aggressively in the send thread.

Browse Source
This commit is contained in:
Lance Stout 2012-04-13 08:27:11 -04:00
parent 4b2b2d16b8
commit 94aa6673ca
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sleekxmpp/xmlstream/xmlstream.py
View File

@ -630,6 +630,8 @@ class XMLStream(object):
# Clearing this event will pause the send loop. # Clearing this event will pause the send loop.
self.session_started_event.clear() self.session_started_event.clear()
self.__failed_send_stanza = None
# Send the end of stream marker. # Send the end of stream marker.
if send_close: if send_close:
self.send_raw(self.stream_footer, now=True) self.send_raw(self.stream_footer, now=True)
@ -1152,9 +1154,11 @@ class XMLStream(object):
log.warning("Failed to send %s", data) log.warning("Failed to send %s", data)
if reconnect is None: if reconnect is None:
reconnect = self.auto_reconnect reconnect = self.auto_reconnect
self.disconnect(reconnect, send_close=False) if not self.stop.is_set():
self.disconnect(reconnect, send_close=False)
log.warning('SSL write error - reattempting') log.warning('SSL write error - reattempting')
time.sleep(self.ssl_retry_delay) if not self.stop.is_set():
time.sleep(self.ssl_retry_delay)
tries += 1 tries += 1
if count > 1: if count > 1:
log.debug('SENT: %d chunks', count) log.debug('SENT: %d chunks', count)
@ -1163,7 +1167,8 @@ class XMLStream(object):
log.warning("Failed to send %s", data) log.warning("Failed to send %s", data)
if reconnect is None: if reconnect is None:
reconnect = self.auto_reconnect reconnect = self.auto_reconnect
self.disconnect(reconnect, send_close=False) if not self.stop.is_set():
self.disconnect(reconnect, send_close=False)
else: else:
self.send_queue.put(data) self.send_queue.put(data)
return True return True
@ -1501,9 +1506,11 @@ class XMLStream(object):
log.debug('SSL error - max retries reached') log.debug('SSL error - max retries reached')
self.exception(serr) self.exception(serr)
log.warning("Failed to send %s", data) log.warning("Failed to send %s", data)
self.disconnect(self.auto_reconnect, send_close=False) if not self.stop.is_set():
self.disconnect(self.auto_reconnect, send_close=False)
log.warning('SSL write error - reattempting') log.warning('SSL write error - reattempting')
time.sleep(self.ssl_retry_delay) if not self.stop.is_set():
time.sleep(self.ssl_retry_delay)
tries += 1 tries += 1
if count > 1: if count > 1:
log.debug('SENT: %d chunks', count) log.debug('SENT: %d chunks', count)
@ -1511,8 +1518,9 @@ class XMLStream(object):
except Socket.error as serr: except Socket.error as serr:
self.event('socket_error', serr, direct=True) self.event('socket_error', serr, direct=True)
log.warning("Failed to send %s", data) log.warning("Failed to send %s", data)
self.__failed_send_stanza = data if not self.stop.is_set():
self.disconnect(self.auto_reconnect, send_close=False) self.__failed_send_stanza = data
self.disconnect(self.auto_reconnect, send_close=False)
except Exception as ex: except Exception as ex:
log.exception('Unexpected error in send thread: %s', ex) log.exception('Unexpected error in send thread: %s', ex)
self.exception(ex) self.exception(ex)