From ebad5ad61c050a341ebed931cd10f4cc56708a97 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 23 Dec 2011 16:52:04 +0000 Subject: [PATCH] tweaks --- router/java/src/net/i2p/router/PeerSelectionCriteria.java | 1 + .../networkdb/kademlia/KademliaNetworkDatabaseFacade.java | 8 ++++---- .../java/src/net/i2p/router/peermanager/PeerTestJob.java | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/router/java/src/net/i2p/router/PeerSelectionCriteria.java b/router/java/src/net/i2p/router/PeerSelectionCriteria.java index 8732b7166..2702ff5ec 100644 --- a/router/java/src/net/i2p/router/PeerSelectionCriteria.java +++ b/router/java/src/net/i2p/router/PeerSelectionCriteria.java @@ -12,6 +12,7 @@ package net.i2p.router; * Defines the criteria for selecting a set of peers for use when searching the * PeerManager * + * Only used by PeerTestJob, which may not have a point. */ public class PeerSelectionCriteria { /** The peers will be used in a tunnel */ diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java index 9c86b7f01..f3a046a45 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -822,10 +822,10 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { if (err != null) throw new IllegalArgumentException("Invalid store attempt - " + err); - if (_log.shouldLog(Log.DEBUG)) - _log.debug("RouterInfo " + key.toBase64() + " is stored with " - + routerInfo.getOptions().size() + " options on " - + new Date(routerInfo.getPublished())); + //if (_log.shouldLog(Log.DEBUG)) + // _log.debug("RouterInfo " + key.toBase64() + " is stored with " + // + routerInfo.getOptions().size() + " options on " + // + new Date(routerInfo.getPublished())); _context.peerManager().setCapabilities(key, routerInfo.getCapabilities()); _ds.put(key, routerInfo, persist); diff --git a/router/java/src/net/i2p/router/peermanager/PeerTestJob.java b/router/java/src/net/i2p/router/peermanager/PeerTestJob.java index ab3f2542e..241fd8bb4 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerTestJob.java +++ b/router/java/src/net/i2p/router/peermanager/PeerTestJob.java @@ -25,6 +25,7 @@ import net.i2p.util.Log; * selection to the peer manager and tests the peer by sending it a useless * database store message * + * TODO - What's the point? Disable this? See also notes in PeerManager.selectPeers() */ public class PeerTestJob extends JobImpl { private final Log _log; @@ -65,7 +66,8 @@ public class PeerTestJob extends JobImpl { _log.info("Stop testing peers"); } - public String getName() { return "Initiate some peer tests"; } + public String getName() { return "Peer test start"; } + public void runJob() { if (!_keepTesting) return; Set peers = selectPeersToTest();