openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Fix EventletConnection without ssl on recent versions of eventlet

Browse Source 
It seems recent versions of eventlet (tested on 0.18.4) has changed
which exception is raised on timeout during recv(). This was not
handled properly by PR #485 which caused a regression.
This commit is contained in:
Sigmund Augdal
2016-03-04 11:34:27 +01:00
parent f6d5558f1f
commit 7a7012b6b3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cassandra/io/eventletreactor.py
View File

@@ -38,7 +38,8 @@ def is_timeout(err):
return (
err in (EINPROGRESS, EALREADY, EWOULDBLOCK) or
(err == EINVAL and os.name in ('nt', 'ce')) or
(isinstance(err, ssl.SSLError) and err.args[0] == 'timed out')
(isinstance(err, ssl.SSLError) and err.args[0] == 'timed out') or
isinstance(err, socket.timeout)
)