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

Merge remote-tracking branch 'flupke/gevent-ssl' into PYTHON-174

Browse Source
This commit is contained in:
Adam Holmberg
2014-11-24 11:19:41 -06:00
parent 623216ef1a 70f1886a3e
commit 6e1154d6d5
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cassandra/io/geventreactor.py
View File

@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import gevent
from gevent import select, socket
from gevent import select, socket, ssl
from gevent.event import Event
from gevent.queue import Queue
@@ -77,6 +77,11 @@ class GeventConnection(Connection):
for (af, socktype, proto, canonname, sockaddr) in addresses:
try:
self._socket = socket.socket(af, socktype, proto)
if self.ssl_options:
self._socket = ssl.wrap_socket(self._socket, **self.ssl_options)
self._ssl_socket = True
else:
self._ssl_socket = False
self._socket.settimeout(1.0)
self._socket.connect(sockaddr)
sockerr = None
@@ -90,8 +95,8 @@ class GeventConnection(Connection):
for args in self.sockopts:
self._socket.setsockopt(*args)
self._read_watcher = gevent.spawn(lambda: self.handle_read())
self._write_watcher = gevent.spawn(lambda: self.handle_write())
self._read_watcher = gevent.spawn(self.handle_read)
self._write_watcher = gevent.spawn(self.handle_write)
self._send_options_message()
def close(self):
@@ -152,6 +157,13 @@ class GeventConnection(Connection):
try:
buf = self._socket.recv(self.in_buffer_size)
self._iobuf.write(buf)
if self._ssl_socket:
# We need to drain pending data when dealing with a SSL socket
data_left = self._socket.pending()
while data_left:
buf = self._socket.recv(data_left)
self._iobuf.write(buf)
data_left = self._socket.pending()
except socket.error as err:
if not is_timeout(err):
log.debug("Exception during socket recv for %s: %s", self, err)