Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

cancel callLater on error or timeout

Browse source
This commit is contained in:
Jack Robison 2018-02-20 13:42:49 -05:00
parent df78f7ff9f
commit b4bc5e2110
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lbrynet/dht/protocol.py
View file

@ -173,6 +173,13 @@ class KademliaProtocol(protocol.DatagramProtocol):
# Transmit the data # Transmit the data
self._send(encodedMsg, msg.id, (contact.address, contact.port)) self._send(encodedMsg, msg.id, (contact.address, contact.port))
self._sentMessages[msg.id] = (contact.id, df, timeoutCall, method, args) self._sentMessages[msg.id] = (contact.id, df, timeoutCall, method, args)
def cancel(err):
if timeoutCall.cancelled or timeoutCall.called:
return err
timeoutCall.cancel()
df.addErrback(cancel)
return df return df
def startProtocol(self): def startProtocol(self):
@ -336,7 +343,8 @@ class KademliaProtocol(protocol.DatagramProtocol):
self._call_later_list[key] = delayed_call self._call_later_list[key] = delayed_call
def _write_and_remove(self, key, txData, address): def _write_and_remove(self, key, txData, address):
del self._call_later_list[key] if key in self._call_later_list:
del self._call_later_list[key]
if self.transport: if self.transport:
try: try:
self.transport.write(txData, address) self.transport.write(txData, address)