RanchiMall/electrumx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove debug logging and peers semaphore.

Browse Source 
Increase STALE_SECS to 4 hrs.  Will revert to 1 day soon.
This commit is contained in:
Neil Booth 2017-02-28 07:27:36 +09:00
parent 05a74253c1
commit 31b978f21e
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/peers.py
View File

@ -25,7 +25,7 @@ import server.version as version
PEERS_FILE = 'peers' PEERS_FILE = 'peers'
PEER_GOOD, PEER_STALE, PEER_NEVER, PEER_BAD = range(4) PEER_GOOD, PEER_STALE, PEER_NEVER, PEER_BAD = range(4)
STALE_SECS = 3600 #86400 STALE_SECS = 3600 * 4 # 86400
WAKEUP_SECS = 300 WAKEUP_SECS = 300
@ -85,7 +85,6 @@ class PeerSession(JSONSession):
'''Handle disconnection.''' '''Handle disconnection.'''
super().connection_lost(exc) super().connection_lost(exc)
self.future.cancel() self.future.cancel()
self.peer_mgr.connection_lost(self)
def on_peers_subscribe(self, result, error): def on_peers_subscribe(self, result, error):
'''Handle the response to the peers.subcribe message.''' '''Handle the response to the peers.subcribe message.'''
@ -218,8 +217,6 @@ class PeerManager(util.LoggedClass):
self.loop = controller.loop self.loop = controller.loop
self.irc = IRC(env, self) self.irc = IRC(env, self)
self.myselves = peers_from_env(env) self.myselves = peers_from_env(env)
# value is max outgoing connections at a time
self.semaphore = asyncio.BoundedSemaphore(value=2)
self.retry_event = asyncio.Event() self.retry_event = asyncio.Event()
# Peers have one entry per hostname. Once connected, the # Peers have one entry per hostname. Once connected, the
# ip_addr property is either None, an onion peer, or the # ip_addr property is either None, an onion peer, or the
@ -231,7 +228,6 @@ class PeerManager(util.LoggedClass):
self.tor_proxy = SocksProxy(env.tor_proxy_host, env.tor_proxy_port, self.tor_proxy = SocksProxy(env.tor_proxy_host, env.tor_proxy_port,
loop=self.loop) loop=self.loop)
self.import_peers() self.import_peers()
self.conn_count = 0
def my_clearnet_peer(self): def my_clearnet_peer(self):
'''Returns the clearnet peer representing this server.''' '''Returns the clearnet peer representing this server.'''
@ -474,16 +470,6 @@ class PeerManager(util.LoggedClass):
if peer.bad or not pairs: if peer.bad or not pairs:
self.maybe_forget_peer(peer) self.maybe_forget_peer(peer)
else: else:
peer.conn_count = self.conn_count
self.conn_count += 1
self.log_info('preparing connection {:d} to {}'
.format(peer.conn_count, peer))
start = time.time()
await self.semaphore.acquire()
elapsed = time.time() - start
if elapsed > 5:
self.log_warning('waited {:.1f}s for connection semaphore'
.format(elapsed))
self.retry_peer(peer, pairs) self.retry_peer(peer, pairs)
def retry_peer(self, peer, port_pairs): def retry_peer(self, peer, port_pairs):
@ -520,16 +506,6 @@ class PeerManager(util.LoggedClass):
self.retry_peer(peer, port_pairs) self.retry_peer(peer, port_pairs)
else: else:
self.set_connection_status(peer, False) self.set_connection_status(peer, False)
self.semaphore.release()
self.log_info('connection {:d} to {} failed'
.format(peer.conn_count, peer))
def connection_lost(self, session):
'''Called by the peer session when disconnected.'''
peer = session.peer
self.log_info('connection {:d} to {} closed'
.format(peer.conn_count, peer))
self.semaphore.release()
def set_connection_status(self, peer, good): def set_connection_status(self, peer, good):
'''Called when a connection succeeded or failed.''' '''Called when a connection succeeded or failed.'''