LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

fix id of new contact replacing a dead contact

Browse source
This commit is contained in:
Jack Robison 2017-10-22 21:16:16 -04:00
parent d23d4c1d73
commit 45adfc533b
No known key found for this signature in database
GPG key ID: 284699E7404E3CFF
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lbrynet/dht/routingtable.py
View file

@ -11,7 +11,6 @@ from zope.interface import implements
import constants import constants
import kbucket import kbucket
from interface import IRoutingTable from interface import IRoutingTable
from error import TimeoutError
import logging import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -83,11 +82,16 @@ class TreeRoutingTable(object):
@type failure: twisted.python.failure.Failure @type failure: twisted.python.failure.Failure
""" """
failure.trap(TimeoutError) # 'failure' is a Failure with an error message in the format:
log.warning('==replacing contact==') # "Timeout connecting to <node id hex>"
# Remove the old contact... error_message = failure.getErrorMessage()
deadContactID = failure.getErrorMessage() deadContactID = error_message[22:].decode('hex')
if len(deadContactID) != constants.key_bits / 8:
raise ValueError("invalid contact id")
log.debug("Replacing dead contact: %s", deadContactID.encode('hex'))
try: try:
# Remove the old contact...
self._buckets[bucketIndex].removeContact(deadContactID) self._buckets[bucketIndex].removeContact(deadContactID)
except ValueError: except ValueError:
# The contact has already been removed (probably due to a timeout) # The contact has already been removed (probably due to a timeout)