Use getRecentPeers for publishing

This commit is contained in:
shortcutme 2017-02-27 00:11:02 +01:00
parent b5d879c1cd
commit 2188c5d9fa
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE

View file

@ -319,6 +319,7 @@ class Site(object):
s = time.time() s = time.time()
peers_try = [] # Try these peers peers_try = [] # Try these peers
queried = [] # Successfully queried from these peers queried = [] # Successfully queried from these peers
limit = 5
# Wait for peers # Wait for peers
if not self.peers: if not self.peers:
@ -496,11 +497,8 @@ class Site(object):
random.shuffle(peers) random.shuffle(peers)
peers = sorted(peers, key=lambda peer: peer.connection.handshake.get("rev", 0) < config.rev - 100) # Prefer newer clients 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: # Add more, non-connected peers if necessary
if len(peers) < limit * 2: peers += self.getRecentPeers(limit * 2)
peers_more = self.peers.values()
random.shuffle(peers_more)
peers += peers_more[0:limit * 2]
self.log.info("Publishing %s to %s/%s peers (connected: %s) diffs: %s (%.2fk)..." % ( 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 inner_path, limit, len(self.peers), num_connected_peers, diffs.keys(), float(len(str(diffs))) / 1024