From 2188c5d9fa80ce9080acebca20f3386fd7c6615b Mon Sep 17 00:00:00 2001 From: shortcutme Date: Mon, 27 Feb 2017 00:11:02 +0100 Subject: [PATCH] Use getRecentPeers for publishing --- src/Site/Site.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Site/Site.py b/src/Site/Site.py index bfaec5f3..297ff25e 100644 --- a/src/Site/Site.py +++ b/src/Site/Site.py @@ -319,6 +319,7 @@ class Site(object): s = time.time() peers_try = [] # Try these peers queried = [] # Successfully queried from these peers + limit = 5 # Wait for peers if not self.peers: @@ -496,11 +497,8 @@ class Site(object): random.shuffle(peers) peers = sorted(peers, key=lambda peer: peer.connection.handshake.get("rev", 0) < config.rev - 100) # Prefer newer clients - # Add more, non-connected peers is necessary - if len(peers) < limit * 2: - peers_more = self.peers.values() - random.shuffle(peers_more) - peers += peers_more[0:limit * 2] + if len(peers) < limit * 2: # Add more, non-connected peers if necessary + peers += self.getRecentPeers(limit * 2) self.log.info("Publishing %s to %s/%s peers (connected: %s) diffs: %s (%.2fk)..." % ( inner_path, limit, len(self.peers), num_connected_peers, diffs.keys(), float(len(str(diffs))) / 1024