From d2d82472eacfc0516f97b9eac5b23d069fd2bd51 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Wed, 24 Apr 2019 19:05:21 +0100 Subject: [PATCH] peers.py: better log peer discovery settings --- electrumx/server/env.py | 2 +- electrumx/server/peers.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/electrumx/server/env.py b/electrumx/server/env.py index f053c75..38c9bc5 100644 --- a/electrumx/server/env.py +++ b/electrumx/server/env.py @@ -28,7 +28,7 @@ class Env(EnvBase): ''' # Peer discovery - PD_OFF, PD_SELF, PD_ON = range(3) + PD_OFF, PD_SELF, PD_ON = ('OFF', 'SELF', 'ON') def __init__(self, coin=None): super().__init__() diff --git a/electrumx/server/peers.py b/electrumx/server/peers.py index 1333f8f..72b5596 100644 --- a/electrumx/server/peers.py +++ b/electrumx/server/peers.py @@ -443,15 +443,16 @@ class PeerManager: 2) Verifying connectivity of new peers. 3) Retrying old peers at regular intervals. ''' + self.logger.info(f'peer discovery: {self.env.peer_discovery}') if self.env.peer_discovery != self.env.PD_ON: self.logger.info('peer discovery is disabled') return - self.logger.info(f'beginning peer discovery. Force use of ' - f'proxy: {self.env.force_proxy}') - forever = Event() + self.logger.info(f'announce ourself: {self.env.peer_announce}') + self.logger.info(f'my clearnet self: {self._my_clearnet_peer()}') + self.logger.info(f'force use of proxy: {self.env.force_proxy}') + self.logger.info(f'beginning peer discovery...') async with self.group as group: - await group.spawn(forever.wait()) await group.spawn(self._refresh_blacklist()) await group.spawn(self._detect_proxy()) await group.spawn(self._import_peers())