citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Retry for certain non-blocking operations

Browse Source 
- sometimes on read, EWOULDBLOCK is returned. It should retry. A timeout
  is handled separately
This commit is contained in:
Peter Šurda 2017-02-06 19:41:25 +01:00
parent 61770ba89a
commit ddc0ca5ede
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/class_receiveDataThread.py
View File

@ -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