diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java index a749c28b1c29ee1841618428e794e8fe8706020e..ab521d885ccc57c8be00f11502194eca44242523 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java @@ -253,12 +253,12 @@ public class ProfileOrganizer { locked_selectPeers(_fastPeers, howMany, exclude, matches); } if (matches.size() < howMany) { - if (_log.shouldLog(Log.DEBUG)) - _log.debug("selectFastPeers("+howMany+"), not enough fast (" + matches.size() + ") going on to highCap"); + if (_log.shouldLog(Log.INFO)) + _log.info("selectFastPeers("+howMany+"), not enough fast (" + matches.size() + ") going on to highCap"); selectHighCapacityPeers(howMany, exclude, matches); } else { - if (_log.shouldLog(Log.DEBUG)) - _log.debug("selectFastPeers("+howMany+"), found enough fast (" + matches.size() + ")"); + if (_log.shouldLog(Log.INFO)) + _log.info("selectFastPeers("+howMany+"), found enough fast (" + matches.size() + ")"); } return; } @@ -279,12 +279,12 @@ public class ProfileOrganizer { locked_selectPeers(_highCapacityPeers, howMany, exclude, matches); } if (matches.size() < howMany) { - if (_log.shouldLog(Log.DEBUG)) - _log.debug("selectHighCap("+howMany+"), not enough fast (" + matches.size() + ") going on to notFailing"); + if (_log.shouldLog(Log.INFO)) + _log.info("selectHighCap("+howMany+"), not enough fast (" + matches.size() + ") going on to notFailing"); selectNotFailingPeers(howMany, exclude, matches); } else { - if (_log.shouldLog(Log.DEBUG)) - _log.debug("selectHighCap("+howMany+"), found enough highCap (" + matches.size() + ")"); + if (_log.shouldLog(Log.INFO)) + _log.info("selectHighCap("+howMany+"), found enough highCap (" + matches.size() + ")"); } return; } @@ -297,12 +297,12 @@ public class ProfileOrganizer { locked_selectPeers(_wellIntegratedPeers, howMany, exclude, matches); } if (matches.size() < howMany) { - if (_log.shouldLog(Log.DEBUG)) - _log.debug("selectWellIntegrated("+howMany+"), not enough integrated (" + matches.size() + ") going on to notFailing"); + if (_log.shouldLog(Log.INFO)) + _log.info("selectWellIntegrated("+howMany+"), not enough integrated (" + matches.size() + ") going on to notFailing"); selectNotFailingPeers(howMany, exclude, matches); } else { - if (_log.shouldLog(Log.DEBUG)) - _log.debug("selectWellIntegrated("+howMany+"), found enough well integrated (" + matches.size() + ")"); + if (_log.shouldLog(Log.INFO)) + _log.info("selectWellIntegrated("+howMany+"), found enough well integrated (" + matches.size() + ")"); } return; @@ -369,17 +369,17 @@ public class ProfileOrganizer { } } } - if (_log.shouldLog(Log.DEBUG)) - _log.debug("Selecting all not failing found " + (matches.size()-orig) + " new peers: " + selected); + if (_log.shouldLog(Log.INFO)) + _log.info("Selecting all not failing found " + (matches.size()-orig) + " new peers: " + selected); matches.addAll(selected); } if (matches.size() < howMany) { - if (_log.shouldLog(Log.DEBUG)) - _log.debug("selectAllNotFailing("+howMany+"), not enough (" + matches.size() + ") going on to failing"); + if (_log.shouldLog(Log.INFO)) + _log.info("selectAllNotFailing("+howMany+"), not enough (" + matches.size() + ") going on to failing"); selectFailingPeers(howMany, exclude, matches); } else { - if (_log.shouldLog(Log.DEBUG)) - _log.debug("selectAllNotFailing("+howMany+"), enough (" + matches.size() + ")"); + if (_log.shouldLog(Log.INFO)) + _log.info("selectAllNotFailing("+howMany+"), enough (" + matches.size() + ")"); } return; } @@ -477,8 +477,8 @@ public class ProfileOrganizer { int minFastPeers = getMinimumFastPeers(); int numToPromote = minFastPeers - _fastPeers.size(); if (numToPromote > 0) { - if (_log.shouldLog(Log.DEBUG)) - _log.debug("Need to explicitly promote " + numToPromote + " peers to the fast group"); + if (_log.shouldLog(Log.INFO)) + _log.info("Need to explicitly promote " + numToPromote + " peers to the fast group"); for (Iterator iter = _strictCapacityOrder.iterator(); iter.hasNext(); ) { PeerProfile cur = (PeerProfile)iter.next(); if ( (!_fastPeers.containsKey(cur.getPeer())) && (!cur.getIsFailing()) ) { diff --git a/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java b/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java index f87215c2806b1994394639277fe004027b440eed..1f7e107586d04d30c118d13c2322c1a73cce4468 100644 --- a/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java +++ b/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java @@ -678,9 +678,10 @@ public class RequestTunnelJob extends JobImpl { getContext().profileManager().tunnelRejected(_tunnel.getThisHop(), responseTime, false); getContext().profileManager().messageFailed(_tunnel.getThisHop()); - // one (or both) of the tunnels used to send the request / receive a reply failed - _pool.tunnelFailed(_replyTunnelId); - _pool.tunnelFailed(_outboundTunnelId); + // one (or both) of the tunnels used to send the request / receive + // a reply failed, or the peer failed, or the peer's tunnels failed + //_pool.tunnelFailed(_replyTunnelId); + //_pool.tunnelFailed(_outboundTunnelId); Failure.this.getContext().statManager().updateFrequency("tunnel.buildFailFrequency"); fail();