Bitmessage/PyBitmessage-2024-12-15
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Better fix for issue #183 #281

Merged
ghost merged 1 commits from cpu100percentfix into master 2013-07-03 04:29:05 +02:00
Conversation 1 Commits 1 Files Changed 1 +2 -4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/class_receiveDataThread.py
View File

@ -65,11 +65,9 @@ class receiveDataThread(threading.Thread):
print 'ID of the receiveDataThread is', str(id(self)) + '. The size of the shared.connectedHostsList is now', len(shared.connectedHostsList) print 'ID of the receiveDataThread is', str(id(self)) + '. The size of the shared.connectedHostsList is now', len(shared.connectedHostsList)
shared.printLock.release() shared.printLock.release()
while True: while True:
try:
dataLen = len(self.data) dataLen = len(self.data)
try:
self.data += self.sock.recv(4096) self.data += self.sock.recv(4096)
if len(self.data) == dataLen: # recv returns 0 bytes when the remote closes the connection
raise Exception("Remote closed the connection")
except socket.timeout: except socket.timeout:
shared.printLock.acquire() shared.printLock.acquire()
print 'Timeout occurred waiting for data from', self.HOST + '. Closing receiveData thread. (ID:', str(id(self)) + ')' print 'Timeout occurred waiting for data from', self.HOST + '. Closing receiveData thread. (ID:', str(id(self)) + ')'
@ -81,7 +79,7 @@ class receiveDataThread(threading.Thread):
shared.printLock.release() shared.printLock.release()
break break
# print 'Received', repr(self.data) # print 'Received', repr(self.data)
if self.data == "": if len(self.data) == dataLen:
shared.printLock.acquire() shared.printLock.acquire()
print 'Connection to', self.HOST, 'closed. Closing receiveData thread. (ID:', str(id(self)) + ')' print 'Connection to', self.HOST, 'closed. Closing receiveData thread. (ID:', str(id(self)) + ')'
shared.printLock.release() shared.printLock.release()