idk/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

log tweaks for b32

Browse Source
This commit is contained in:
zzz
2018-01-13 12:59:48 +00:00
parent 7493134f25
commit fcb835da34
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
router/java/src/net/i2p/router/client/ClientManager.java
View File

@@ -297,7 +297,7 @@ class ClientManager {
*/
public int destinationEstablished(ClientConnectionRunner runner, Destination dest) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("DestinationEstablished called for destination " + dest.calculateHash().toBase64());
_log.debug("DestinationEstablished called for destination " + dest.toBase32());
synchronized (_pendingRunners) {
_pendingRunners.remove(runner);
@@ -321,9 +321,9 @@ class ClientManager {
}
}
if (rv == SessionStatusMessage.STATUS_INVALID) {
_log.log(Log.CRIT, "Client attempted to register duplicate destination " + dest.calculateHash().toBase64());
_log.log(Log.CRIT, "Client attempted to register duplicate destination " + dest.toBase32());
} else if (rv == SessionStatusMessage.STATUS_REFUSED) {
_log.error("Max sessions exceeded " + dest.calculateHash().toBase64());
_log.error("Max sessions exceeded " + dest.toBase32());
}
return rv;
}
@@ -447,7 +447,7 @@ class ClientManager {
if (runner == null) {
if (_log.shouldLog(Log.WARN))
_log.warn("Cannot request the lease set, as we can't find a client runner for "
+ dest.calculateHash().toBase64() + ". disconnected?");
+ dest.toBase32() + ". disconnected?");
_ctx.jobQueue().addJob(onFailedJob);
} else {
runner.requestLeaseSet(dest.calculateHash(), set, timeout, onCreateJob, onFailedJob);

2
router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
View File

@@ -96,7 +96,7 @@ public class ClientManagerFacadeImpl extends ClientManagerFacade implements Inte
long howLongAgo = _context.clock().now() - ls.getEarliestLeaseDate();
if (howLongAgo > MAX_TIME_TO_REBUILD) {
if (_log.shouldLog(Log.ERROR))
_log.error("Client " + dest.calculateHash().toBase64().substring(0,6)
_log.error("Client " + dest.toBase32()
+ " has a leaseSet that expired " + DataHelper.formatDuration(howLongAgo) + " ago");
lively = false;
}

14
router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
View File

@@ -128,7 +128,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
return pool.selectTunnel();
}
if (_log.shouldLog(Log.ERROR))
_log.error("Want the inbound tunnel for " + destination.calculateHash() +
_log.error("Want the inbound tunnel for " + destination.toBase32() +
" but there isn't a pool?");
return null;
}
@@ -204,7 +204,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
return pool.selectTunnel(closestTo);
}
if (_log.shouldLog(Log.ERROR))
_log.error("Want the inbound tunnel for " + destination.calculateHash() +
_log.error("Want the inbound tunnel for " + destination.toBase32() +
" but there isn't a pool?");
return null;
}
@@ -403,7 +403,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
public void buildTunnels(Destination client, ClientTunnelSettings settings) {
Hash dest = client.calculateHash();
if (_log.shouldLog(Log.DEBUG))
_log.debug("Building tunnels for the client " + dest + ": " + settings);
_log.debug("Building tunnels for the client " + client.toBase32() + ": " + settings);
TunnelPool inbound = null;
TunnelPool outbound = null;
@@ -456,7 +456,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
TunnelPool outbound = _clientOutboundPools.get(h);
if (inbound != null || outbound != null) {
if (_log.shouldLog(Log.WARN))
_log.warn("already have alias " + dest);
_log.warn("already have alias " + dest.toBase32());
return false;
}
TunnelPool eInbound = _clientInboundPools.get(e);
@@ -480,7 +480,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
outbound.startup();
}
if (_log.shouldLog(Log.WARN))
_log.warn("Added " + h + " as alias for " + e + " with settings " + settings);
_log.warn("Added " + dest.toBase32() + " as alias for " + existingClient.toBase32() + " with settings " + settings);
return true;
}
@@ -538,11 +538,11 @@ public class TunnelPoolManager implements TunnelManagerFacade {
public synchronized void removeTunnels(Hash destination) {
if (destination == null) return;
if (_log.shouldLog(Log.DEBUG))
_log.debug("Removing tunnels for the client " + destination);
_log.debug("Removing tunnels for the client " + destination.toBase32());
if (_context.clientManager().isLocal(destination)) {
// race with buildTunnels() on restart of a client
if (_log.shouldLog(Log.WARN))
_log.warn("Not removing pool still registered with client manager: " + destination.toBase64(), new Exception("i did it"));
_log.warn("Not removing pool still registered with client manager: " + destination.toBase32(), new Exception("i did it"));
return;
}
TunnelPool inbound = _clientInboundPools.remove(destination);