Retry for certain non-blocking operations
- sometimes on read, EWOULDBLOCK is returned. It should retry. A timeout is handled separately
This commit is contained in:
parent
61770ba89a
commit
ddc0ca5ede
|
@ -100,13 +100,13 @@ class receiveDataThread(threading.Thread):
|
||||||
logger.error ('Timeout occurred waiting for data from ' + str(self.peer) + '. Closing receiveData thread. (ID: ' + str(id(self)) + ')')
|
logger.error ('Timeout occurred waiting for data from ' + str(self.peer) + '. Closing receiveData thread. (ID: ' + str(id(self)) + ')')
|
||||||
break
|
break
|
||||||
except socket.error as err:
|
except socket.error as err:
|
||||||
# if err.errno == 2 or (sys.platform == 'win32' and err.errno == 10035) or (sys.platform != 'win32' and err.errno == errno.EWOULDBLOCK):
|
if err.errno == errno.EWOULDBLOCK:
|
||||||
# if ssl:
|
if ssl:
|
||||||
# select.select([self.sslSock], [], [])
|
select.select([self.sslSock], [], [], 10)
|
||||||
# else:
|
else:
|
||||||
# select.select([self.sock], [], [])
|
select.select([self.sock], [], [], 10)
|
||||||
# logger.error('sock.recv retriable error')
|
logger.error('sock.recv retriable error')
|
||||||
# continue
|
continue
|
||||||
logger.error('sock.recv error. Closing receiveData thread (' + str(self.peer) + ', Thread ID: ' + str(id(self)) + ').' + str(err.errno) + "/" + str(err))
|
logger.error('sock.recv error. Closing receiveData thread (' + str(self.peer) + ', Thread ID: ' + str(id(self)) + ').' + str(err.errno) + "/" + str(err))
|
||||||
if self.initiatedConnection and not self.connectionIsOrWasFullyEstablished:
|
if self.initiatedConnection and not self.connectionIsOrWasFullyEstablished:
|
||||||
shared.timeOffsetWrongCount += 1
|
shared.timeOffsetWrongCount += 1
|
||||||
|
|
Loading…
Reference in New Issue
Block a user