From 6f4b896bce79a47c58e72b57a87db77e35cce706 Mon Sep 17 00:00:00 2001 From: HelloZeroNet Date: Wed, 16 Mar 2016 21:11:04 +0100 Subject: [PATCH] Always publish to 5 peers and remove discrimination of active peers --- src/Site/Site.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/Site/Site.py b/src/Site/Site.py index 941b09df..7d9b25fc 100644 --- a/src/Site/Site.py +++ b/src/Site/Site.py @@ -361,11 +361,7 @@ class Site(object): threads = 5 if limit == "default": - if len(self.peers) > 50: - limit = 3 - threads = 3 - else: - limit = 5 + limit = 5 peers = self.getConnectedPeers() num_connected_peers = len(peers) @@ -395,19 +391,14 @@ class Site(object): if len(published) == 0: gevent.joinall(publishers) # No successful publish, wait for all publisher - # Make sure the connected passive peers got the update - passive_peers = [ - peer for peer in peers - if peer.connection and not peer.connection.closed and peer.key.endswith(":0") and peer not in published - ] # Every connected passive peer that we not published to - + # Publish more peers in the backgroup self.log.info( - "Successfuly %s published to %s peers, publishing to %s more passive peers" % ( - inner_path, len(published), len(passive_peers) + "Successfuly %s published to %s peers, publishing to %s more peers in the background" % ( + inner_path, len(published), limit )) - for peer in passive_peers[0:limit]: - gevent.spawn(self.publisher, inner_path, passive_peers, published, limit=limit*2) + for thread in range(2): + gevent.spawn(self.publisher, inner_path, peers, published, limit=limit*2) # Send my hashfield to every connected peer if changed gevent.spawn(self.sendMyHashfield, 100)