Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion cassandra/io/libevreactor.py
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,10 @@ def close(self):
msg = "Connection to %s was closed" % self.endpoint
if self.last_error:
msg += ": %s" % (self.last_error,)
self.error_all_requests(ConnectionShutdown(msg))
shutdown_exc = ConnectionShutdown(msg)
self.error_all_requests(shutdown_exc)
if not self.connected_event.is_set():
self.last_error = shutdown_exc
self.connected_event.set()

def handle_write(self, watcher, revents, errno=None):
Expand Down Expand Up @@ -332,6 +335,8 @@ def handle_write(self, watcher, revents, errno=None):
with self._deque_lock:
self.deque.appendleft(next_msg)
else:
if self.is_closed or self.is_defunct:
return
self.defunct(err)
return
else:
Expand Down Expand Up @@ -365,19 +370,25 @@ def handle_read(self, watcher, revents, errno=None):
if not self._iobuf.tell():
return
else:
if self.is_closed or self.is_defunct:
return
self.defunct(err)
return
elif err.args[0] in NONBLOCKING:
if not self._iobuf.tell():
return
else:
if self.is_closed or self.is_defunct:
return
self.defunct(err)
return

if self._iobuf.tell():
self.process_io_buffer()
else:
log.debug("Connection %s closed by server", self)
self.last_error = ConnectionShutdown(
"Connection to %s was closed by server" % self.endpoint)
self.close()

def push(self, data):
Expand Down
Loading