From 88970cb0a86e8b9cc900388856e293ac9b1043b7 Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Wed, 21 Feb 2018 14:53:12 -0500
Subject: [PATCH] move peer manager class to lbrynet.core
---
.../peermanager.py => core/PeerManager.py} | 0
lbrynet/core/Session.py | 13 ++++++++-----
lbrynet/daemon/Daemon.py | 2 +-
lbrynet/daemon/DaemonServer.py | 1 +
lbrynet/dht/node.py | 19 +++++++++----------
lbrynet/tests/functional/test_misc.py | 2 +-
lbrynet/tests/functional/test_reflector.py | 5 ++---
lbrynet/tests/functional/test_streamify.py | 2 +-
.../core/client/test_ConnectionManager.py | 2 +-
9 files changed, 24 insertions(+), 22 deletions(-)
rename lbrynet/{dht/peermanager.py => core/PeerManager.py} (100%)
diff --git a/lbrynet/dht/peermanager.py b/lbrynet/core/PeerManager.py
similarity index 100%
rename from lbrynet/dht/peermanager.py
rename to lbrynet/core/PeerManager.py
diff --git a/lbrynet/core/Session.py b/lbrynet/core/Session.py
index 436b46c52..b8ef9ebcb 100644
--- a/lbrynet/core/Session.py
+++ b/lbrynet/core/Session.py
@@ -2,7 +2,7 @@ import logging
import miniupnpc
from twisted.internet import threads, defer
from lbrynet.core.BlobManager import DiskBlobManager
-from lbrynet.dht import node, peermanager, hashannouncer
+from lbrynet.dht import node
from lbrynet.database.storage import SQLiteStorage
from lbrynet.core.RateLimiter import RateLimiter
from lbrynet.core.utils import generate_id
@@ -122,6 +122,7 @@ class Session(object):
self.payment_rate_manager_class = payment_rate_manager_class or NegotiatedPaymentRateManager
self.is_generous = is_generous
self.storage = storage or SQLiteStorage(self.db_dir)
+ self._join_dht_deferred = None
def setup(self):
"""Create the blob directory and database if necessary, start all desired services"""
@@ -221,9 +222,7 @@ class Session(object):
d.addErrback(upnp_failed)
return d
- @defer.inlineCallbacks
- def _setup_dht(self):
- log.info("Starting DHT")
+ def _setup_dht(self): # does not block startup, the dht will re-attempt if necessary
self.dht_node = self.dht_node_class(
self.hash_announcer,
udpPort=self.dht_node_port,
@@ -233,7 +232,11 @@ class Session(object):
peer_manager=self.peer_manager,
peer_finder=self.peer_finder,
)
- yield self.dht_node.joinNetwork(self.known_dht_nodes)
+ self.peer_manager = self.dht_node.peer_manager
+ self.peer_finder = self.dht_node.peer_finder
+ self.hash_announcer = self.dht_node.hash_announcer
+ self._join_dht_deferred = self.dht_node.joinNetwork(self.known_dht_nodes)
+ self._join_dht_deferred.addCallback(lambda _: log.info("Joined the dht"))
def _setup_other_components(self):
log.debug("Setting up the rest of the components")
diff --git a/lbrynet/daemon/Daemon.py b/lbrynet/daemon/Daemon.py
index 6ee6b8fcf..652fb370e 100644
--- a/lbrynet/daemon/Daemon.py
+++ b/lbrynet/daemon/Daemon.py
@@ -313,7 +313,7 @@ class Daemon(AuthJSONRPCServer):
self.session.peer_manager)
try:
- log.info("Daemon bound to port: %d", self.peer_port)
+ log.info("Peer protocol listening on TCP %d", self.peer_port)
self.lbry_server_port = reactor.listenTCP(self.peer_port, server_factory)
except error.CannotListenError as e:
import traceback
diff --git a/lbrynet/daemon/DaemonServer.py b/lbrynet/daemon/DaemonServer.py
index 588f5a936..e8c00606b 100644
--- a/lbrynet/daemon/DaemonServer.py
+++ b/lbrynet/daemon/DaemonServer.py
@@ -39,6 +39,7 @@ class DaemonServer(object):
try:
self.server_port = reactor.listenTCP(
conf.settings['api_port'], lbrynet_server, interface=conf.settings['api_host'])
+ log.info("lbrynet API listening on TCP %s:%i", conf.settings['api_host'], conf.settings['api_port'])
except error.CannotListenError:
log.info('Daemon already running, exiting app')
raise
diff --git a/lbrynet/dht/node.py b/lbrynet/dht/node.py
index eb595b130..c7e18af77 100644
--- a/lbrynet/dht/node.py
+++ b/lbrynet/dht/node.py
@@ -11,23 +11,23 @@ import hashlib
import operator
import struct
import time
+import logging
from twisted.internet import defer, error, task
+from lbrynet.core.utils import generate_id
+from lbrynet.core.PeerManager import PeerManager
+
import constants
import routingtable
import datastore
import protocol
from error import TimeoutError
-
-from peermanager import PeerManager
from hashannouncer import DHTHashAnnouncer
from peerfinder import DHTPeerFinder
from contact import Contact
from hashwatcher import HashWatcher
from distance import Distance
-import logging
-from lbrynet.core.utils import generate_id
log = logging.getLogger(__name__)
@@ -168,7 +168,6 @@ class Node(object):
def start_listening(self):
try:
self._listeningPort = self.reactor_listenUDP(self.port, self._protocol)
- log.info("DHT node listening on %i", self.port)
except error.CannotListenError as e:
import traceback
log.error("Couldn't bind to port %d. %s", self.port, traceback.format_exc())
@@ -191,12 +190,12 @@ class Node(object):
bootstrap_contacts = self.contacts
defer.returnValue(bootstrap_contacts)
- def _rerun(bootstrap_contacts):
- if not bootstrap_contacts:
- log.info("Failed to join the dht, re-attempting in 60 seconds")
- self.reactor_callLater(60, self.bootstrap_join, known_node_addresses, finished_d)
+ def _rerun(closest_nodes):
+ if not closest_nodes:
+ log.info("Failed to join the dht, re-attempting in 30 seconds")
+ self.reactor_callLater(30, self.bootstrap_join, known_node_addresses, finished_d)
elif not finished_d.called:
- finished_d.callback(bootstrap_contacts)
+ finished_d.callback(closest_nodes)
log.info("Attempting to join the DHT network")
d = _resolve_seeds()
diff --git a/lbrynet/tests/functional/test_misc.py b/lbrynet/tests/functional/test_misc.py
index 327976c5e..dffb100ec 100644
--- a/lbrynet/tests/functional/test_misc.py
+++ b/lbrynet/tests/functional/test_misc.py
@@ -23,7 +23,7 @@ from twisted.trial.unittest import TestCase
from twisted.python.failure import Failure
from lbrynet.dht.node import Node
-from lbrynet.dht.peermanager import PeerManager
+from lbrynet.core.PeerManager import PeerManager
from lbrynet.core.RateLimiter import DummyRateLimiter, RateLimiter
from lbrynet.core.server.BlobRequestHandler import BlobRequestHandlerFactory
from lbrynet.core.server.ServerProtocol import ServerProtocolFactory
diff --git a/lbrynet/tests/functional/test_reflector.py b/lbrynet/tests/functional/test_reflector.py
index 4ba01dd4b..09342d3bd 100644
--- a/lbrynet/tests/functional/test_reflector.py
+++ b/lbrynet/tests/functional/test_reflector.py
@@ -4,8 +4,7 @@ from twisted.trial import unittest
from lbrynet import conf
from lbrynet.core.StreamDescriptor import get_sd_info
from lbrynet import reflector
-from lbrynet.core import BlobManager
-from lbrynet.dht import peermanager
+from lbrynet.core import BlobManager, PeerManager
from lbrynet.core import Session
from lbrynet.core import StreamDescriptor
from lbrynet.lbry_file.client import EncryptedFileOptions
@@ -28,7 +27,7 @@ class TestReflector(unittest.TestCase):
self.port = None
self.addCleanup(self.take_down_env)
wallet = mocks.Wallet()
- peer_manager = peermanager.PeerManager()
+ peer_manager = PeerManager.PeerManager()
peer_finder = mocks.PeerFinder(5553, peer_manager, 2)
hash_announcer = mocks.Announcer()
sd_identifier = StreamDescriptor.StreamDescriptorIdentifier()
diff --git a/lbrynet/tests/functional/test_streamify.py b/lbrynet/tests/functional/test_streamify.py
index ed0f82c9f..c84630272 100644
--- a/lbrynet/tests/functional/test_streamify.py
+++ b/lbrynet/tests/functional/test_streamify.py
@@ -13,7 +13,7 @@ from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier
from lbrynet.file_manager.EncryptedFileCreator import create_lbry_file
from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
from lbrynet.core.StreamDescriptor import get_sd_info
-from lbrynet.dht.peermanager import PeerManager
+from lbrynet.core.PeerManager import PeerManager
from lbrynet.core.RateLimiter import DummyRateLimiter
from lbrynet.tests import mocks
diff --git a/lbrynet/tests/unit/core/client/test_ConnectionManager.py b/lbrynet/tests/unit/core/client/test_ConnectionManager.py
index 57ed1e534..107afa997 100644
--- a/lbrynet/tests/unit/core/client/test_ConnectionManager.py
+++ b/lbrynet/tests/unit/core/client/test_ConnectionManager.py
@@ -3,7 +3,7 @@ from lbrynet.core.server.ServerProtocol import ServerProtocol
from lbrynet.core.client.ClientProtocol import ClientProtocol
from lbrynet.core.RateLimiter import RateLimiter
from lbrynet.core.Peer import Peer
-from lbrynet.dht.peermanager import PeerManager
+from lbrynet.core.PeerManager import PeerManager
from lbrynet.core.Error import NoResponseError
from twisted.trial import unittest