summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-11-23 23:59:05 -0800
committerLance Stout <lancestout@gmail.com>2011-11-23 23:59:05 -0800
commita1d64fa215b56a948f5e55df8f9d21aadccd0e97 (patch)
tree23e068877fbb1be64c0220675350fb71246b24a6 /sleekxmpp/xmlstream
parent5f44c0e678d784d3f67ef1c5d32e1561853cf9ed (diff)
downloadslixmpp-a1d64fa215b56a948f5e55df8f9d21aadccd0e97.tar.gz
slixmpp-a1d64fa215b56a948f5e55df8f9d21aadccd0e97.tar.bz2
slixmpp-a1d64fa215b56a948f5e55df8f9d21aadccd0e97.tar.xz
slixmpp-a1d64fa215b56a948f5e55df8f9d21aadccd0e97.zip
Experimental support for handling SSL write errors.
Diffstat (limited to 'sleekxmpp/xmlstream')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py52
1 files changed, 44 insertions, 8 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 54da1a85..30027ece 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -60,6 +60,14 @@ HANDLER_THREADS = 1
# Flag indicating if the SSL library is available for use.
SSL_SUPPORT = True
+# The time in seconds to delay between attempts to resend data
+# after an SSL error.
+SSL_RETRY_DELAY = 0.5
+
+# The maximum number of times to attempt resending data due to
+# an SSL error.
+SSL_RETRY_MAX = 10
+
# Maximum time to delay between connection attempts is one hour.
RECONNECT_MAX_DELAY = 600
@@ -187,6 +195,8 @@ class XMLStream(object):
self.response_timeout = RESPONSE_TIMEOUT
self.reconnect_delay = None
self.reconnect_max_delay = RECONNECT_MAX_DELAY
+ self.ssl_retry_max = SSL_RETRY_MAX
+ self.ssl_retry_delay = SSL_RETRY_DELAY
self.state = StateMachine(('disconnected', 'connected'))
self.state._set_state('disconnected')
@@ -1006,9 +1016,22 @@ class XMLStream(object):
total = len(data)
sent = 0
count = 0
+ tries = 0
while sent < total and not self.stop.is_set():
- sent += self.socket.send(data[sent:])
- count += 1
+ try:
+ sent += self.socket.send(data[sent:])
+ count += 1
+ except ssl.SSLError as serr:
+ if tries >= self.ssl_retry_max:
+ log.debug('SSL error - max retries reached')
+ self.exception(serr)
+ log.warning("Failed to send %s", data)
+ if reconnect is None:
+ reconnect = self.auto_reconnect
+ self.disconnect(reconnect)
+ log.warning('SSL write error - reattempting')
+ time.sleep(self.ssl_retry_delay)
+ tries += 1
if count > 1:
log.debug('SENT: %d chunks', count)
except Socket.error as serr:
@@ -1335,14 +1358,27 @@ class XMLStream(object):
except queue.Empty:
continue
log.debug("SEND: %s", data)
+ enc_data = data.encode('utf-8')
+ total = len(enc_data)
+ sent = 0
+ count = 0
+ tries = 0
try:
- enc_data = data.encode('utf-8')
- total = len(enc_data)
- sent = 0
- count = 0
while sent < total and not self.stop.is_set():
- sent += self.socket.send(enc_data[sent:])
- count += 1
+ try:
+ sent += self.socket.send(data[sent:])
+ count += 1
+ except ssl.SSLError as serr:
+ if tries >= self.ssl_retry_max:
+ log.debug('SSL error - max retries reached')
+ self.exception(serr)
+ log.warning("Failed to send %s", data)
+ if reconnect is None:
+ reconnect = self.auto_reconnect
+ self.disconnect(reconnect)
+ log.warning('SSL write error - reattempting')
+ time.sleep(self.ssl_retry_delay)
+ tries += 1
if count > 1:
log.debug('SENT: %d chunks', count)
self.send_queue.task_done()