Skip to content

master rebase #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2015
Merged

master rebase #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd9b132
moar tarantool restart tolerance
ko91h Apr 28, 2015
fccbbe0
Merge pull request #56 from ko91h/master
bigbes May 5, 2015
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
37 changes: 23 additions & 14 deletions tarantool/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,14 @@ def connect(self):
def _recv(self, to_read):
buf = ''
while to_read > 0:
tmp = self._socket.recv(to_read)
if not tmp:
try:
tmp = self._socket.recv(to_read)
except socket.error:
raise NetworkError(socket.error(errno.ECONNRESET,
"Lost connection to server during query"))
to_read -= len(tmp)
buf += tmp
else:
to_read -= len(tmp)
buf += tmp
return buf

def _read_response(self):
Expand Down Expand Up @@ -207,13 +209,19 @@ def _opt_reconnect(self):

def check(): # Check that connection is alive
buf = ctypes.create_string_buffer(2)
self._sys_recv(self._socket.fileno(), buf, 1,
socket.MSG_DONTWAIT | socket.MSG_PEEK)
if ctypes.get_errno() == errno.EAGAIN:
ctypes.set_errno(0)
return errno.EAGAIN
return (ctypes.get_errno() if ctypes.get_errno()
else errno.ECONNRESET)
try:
sock_fd = self._socket.fileno()
except socket.error as e:
if e.errno == errno.EBADF:
return errno.ECONNRESET
else:
self._sys_recv(sock_fd, buf, 1,
socket.MSG_DONTWAIT | socket.MSG_PEEK)
if ctypes.get_errno() == errno.EAGAIN:
ctypes.set_errno(0)
return errno.EAGAIN
return (ctypes.get_errno() if ctypes.get_errno()
else errno.ECONNRESET)

last_errno = check()
if self.connected and last_errno == errno.EAGAIN:
Expand All @@ -226,9 +234,10 @@ def check(): # Check that connection is alive
try:
self.connect_basic()
except NetworkError as e:
last_errno = e.errno
if last_errno == 0:
break
pass
else:
if self.connected:
break
warn("Reconnect attempt %d of %d" %
(attempt, self.reconnect_max_attempts), NetworkWarning)
if attempt == self.reconnect_max_attempts:
Expand Down