cis-kuldeep/PyBitmessage-2021-04-27
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Error handling improvement in sendDataThread

Browse Source 
- don't uncecessarily report EPIPE as a big error, just close the
  connection
This commit is contained in:
Peter Šurda 2017-02-21 09:58:28 +01:00
parent ea9f10a8bb
commit fef6126a74
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/class_sendDataThread.py
View File

@ -77,7 +77,7 @@ class sendDataThread(threading.Thread):
def sendBytes(self, data = ""): def sendBytes(self, data = ""):
self.buffer += data self.buffer += data
if len(self.buffer) < throttle.SendThrottle().chunkSize and self.sendDataThreadQueue.qsize() > 1: if len(self.buffer) < throttle.SendThrottle().chunkSize and self.sendDataThreadQueue.qsize() > 1:
return return True
while self.buffer and state.shutdown == 0: while self.buffer and state.shutdown == 0:
isSSL = False isSSL = False
@ -104,16 +104,18 @@ class sendDataThread(threading.Thread):
select.select([], [self.sslSock if isSSL else self.sock], [], 10) select.select([], [self.sslSock if isSSL else self.sock], [], 10)
logger.debug('sock.recv retriable error') logger.debug('sock.recv retriable error')
continue continue
if e.errno in (errno.EPIPE):
logger.debug('Connection broken')
return False
raise raise
throttle.SendThrottle().wait(amountSent) throttle.SendThrottle().wait(amountSent)
self.lastTimeISentData = int(time.time()) self.lastTimeISentData = int(time.time())
self.buffer = self.buffer[amountSent:] self.buffer = self.buffer[amountSent:]
return True
def run(self): def run(self):
logger.debug('sendDataThread starting. ID: ' + str(id(self)) + '. Number of queues in sendDataQueues: ' + str(len(state.sendDataQueues))) logger.debug('sendDataThread starting. ID: ' + str(id(self)) + '. Number of queues in sendDataQueues: ' + str(len(state.sendDataQueues)))
while True: while self.sendBytes():
self.sendBytes()
deststream, command, data = self.sendDataThreadQueue.get() deststream, command, data = self.sendDataThreadQueue.get()
if deststream == 0 or deststream in self.streamNumber: if deststream == 0 or deststream in self.streamNumber: