Fast bootstrap #126

Merged
Atheros1 merged 4 commits from master into master 2013-04-12 20:05:48 +02:00
Showing only changes of commit d4271d0428 - Show all commits

View File

@ -287,14 +287,13 @@ class receiveDataThread(QThread):
except Exception, err: except Exception, err:
print 'Within receiveDataThread run(), self.sock.close() failed.', err print 'Within receiveDataThread run(), self.sock.close() failed.', err
#try: try:
del selfInitiatedConnections[self.streamNumber][self] del selfInitiatedConnections[self.streamNumber][self]
#self.selfInitiatedConnectionList.remove(self)
printLock.acquire() printLock.acquire()
print 'removed self (a receiveDataThread) from ConnectionList' print 'removed self (a receiveDataThread) from ConnectionList'
printLock.release() printLock.release()
#except: except:
# pass pass
broadcastToSendDataQueues((0, 'shutdown', self.HOST)) broadcastToSendDataQueues((0, 'shutdown', self.HOST))
if self.connectionIsOrWasFullyEstablished: #We don't want to decrement the number of connections and show the result if we never incremented it in the first place (which we only do if the connection is fully established- meaning that both nodes accepted each other's version packets.) if self.connectionIsOrWasFullyEstablished: #We don't want to decrement the number of connections and show the result if we never incremented it in the first place (which we only do if the connection is fully established- meaning that both nodes accepted each other's version packets.)
connectionsCountLock.acquire() connectionsCountLock.acquire()