From ebc83b4028708d112df543a98dbc2f5020be0336 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sat, 10 Mar 2018 09:48:04 +0800 Subject: [PATCH] Import peers in main_loop Also only if peer discovery is enabled. It's less confusing that way. --- server/peers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/peers.py b/server/peers.py index 9d15b75..5904e21 100644 --- a/server/peers.py +++ b/server/peers.py @@ -240,7 +240,6 @@ class PeerManager(util.LoggedClass): self.permit_onion_peer_time = time.time() self.proxy = SocksProxy(env.tor_proxy_host, env.tor_proxy_port, loop=self.loop) - self.import_peers() def my_clearnet_peer(self): '''Returns the clearnet peer representing this server, if any.''' @@ -427,6 +426,8 @@ class PeerManager(util.LoggedClass): self.logger.info('peer discovery is disabled') return + self.import_peers() + # Wait a few seconds after starting the proxy detection loop # for proxy detection to succeed self.ensure_future(self.proxy.auto_detect_loop())