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

don't block the dht component on populating the routing table

Browse source
This commit is contained in:
Jack Robison 2018-11-07 18:35:00 -05:00
parent 572777305e
commit 7b32e2ff7c
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lbrynet/dht/node.py
View file

@ -246,7 +246,7 @@ class Node(MockKademliaHelper):
yield _iterative_join() yield _iterative_join()
@defer.inlineCallbacks @defer.inlineCallbacks
def start(self, known_node_addresses=None): def start(self, known_node_addresses=None, block_on_join=False):
""" Causes the Node to attempt to join the DHT network by contacting the """ Causes the Node to attempt to join the DHT network by contacting the
known DHT nodes. This can be called multiple times if the previous attempt known DHT nodes. This can be called multiple times if the previous attempt
has failed or if the Node has lost all the contacts. has failed or if the Node has lost all the contacts.
@ -261,8 +261,11 @@ class Node(MockKademliaHelper):
self.start_listening() self.start_listening()
yield self._protocol._listening yield self._protocol._listening
# TODO: Refresh all k-buckets further away than this node's closest neighbour # TODO: Refresh all k-buckets further away than this node's closest neighbour
yield self.joinNetwork(known_node_addresses or []) d = self.joinNetwork(known_node_addresses or [])
self.start_looping_calls() d.addCallback(lambda _: self.start_looping_calls())
d.addCallback(lambda _: log.info("Joined the dht"))
if block_on_join:
yield d
def start_looping_calls(self): def start_looping_calls(self):
self.safe_start_looping_call(self._change_token_lc, constants.tokenSecretChangeInterval) self.safe_start_looping_call(self._change_token_lc, constants.tokenSecretChangeInterval)

2
lbrynet/extras/daemon/Components.py
View file

@ -441,7 +441,7 @@ class DHTComponent(Component):
peerPort=self.external_peer_port peerPort=self.external_peer_port
) )
yield self.dht_node.start(GCS('known_dht_nodes')) yield self.dht_node.start(GCS('known_dht_nodes'), block_on_join=False)
log.info("Started the dht") log.info("Started the dht")
@defer.inlineCallbacks @defer.inlineCallbacks