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

logging cleanups

Browse Source
This commit is contained in:
zzz
2012-09-10 17:22:51 +00:00
parent 2f98d05e7c
commit 3781928693
4 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java
View File

@@ -389,7 +389,8 @@ class MessageOutputStream extends OutputStream {
// should we? To be researched further.
// false -> wait for completion, not just accept.
flush(false);
_log.debug("Output stream closed after writing " + _written);
if (_log.shouldLog(Log.DEBUG))
_log.debug("Output stream closed after writing " + _written);
ByteArray ba = null;
synchronized (_dataLock) {
if (_buf != null) {

10
core/java/src/net/i2p/util/SimpleScheduler.java
View File

@@ -174,9 +174,13 @@ public class SimpleScheduler {
long time = System.currentTimeMillis() - before;
if (time > 1000 && _log.shouldLog(Log.WARN))
_log.warn(_name + " wtf, event execution took " + time + ": " + _timedEvent);
long completed = _executor.getCompletedTaskCount();
if (_log.shouldLog(Log.INFO) && completed % 250 == 0)
_log.info(debug());
if (_log.shouldLog(Log.INFO)) {
// this call is slow - iterates through a HashMap -
// would be better to have a local AtomicLong if we care
long completed = _executor.getCompletedTaskCount();
if (completed % 250 == 0)
_log.info(debug());
}
}
}

11
core/java/src/net/i2p/util/SimpleTimer2.java
View File

@@ -368,9 +368,13 @@ public class SimpleTimer2 {
long time = System.currentTimeMillis() - before;
if (time > 500 && _log.shouldLog(Log.WARN))
_log.warn(_pool + " wtf, event execution took " + time + ": " + this);
long completed = _pool.getCompletedTaskCount();
if (_log.shouldLog(Log.INFO) && completed % 250 == 0)
_log.info(_pool.debug());
if (_log.shouldLog(Log.INFO)) {
// this call is slow - iterates through a HashMap -
// would be better to have a local AtomicLong if we care
long completed = _pool.getCompletedTaskCount();
if (completed % 250 == 0)
_log.info(_pool.debug());
}
}
/**
@@ -387,6 +391,7 @@ public class SimpleTimer2 {
return _name;
}
/** warning - slow */
private long getCompletedTaskCount() {
return _executor.getCompletedTaskCount();
}

11
router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
View File

@@ -449,7 +449,8 @@ class PersistentDataStore extends TransientDataStore {
// so add it here.
getContext().profileManager().heardAbout(ri.getIdentity().getHash(), ri.getPublished());
} catch (IllegalArgumentException iae) {
_log.info("Refused locally loaded routerInfo - deleting", iae);
if (_log.shouldLog(Log.INFO))
_log.info("Refused locally loaded routerInfo - deleting", iae);
corrupt = true;
}
}
@@ -524,10 +525,12 @@ class PersistentDataStore extends TransientDataStore {
File f = new File(dir, riName);
if (f.exists()) {
boolean removed = f.delete();
if (!removed)
_log.warn("Unable to remove router info at " + f.getAbsolutePath());
else
if (!removed) {
if (_log.shouldLog(Log.WARN))
_log.warn("Unable to remove router info at " + f.getAbsolutePath());
} else if (_log.shouldLog(Log.INFO)) {
_log.info("Removed router info at " + f.getAbsolutePath());
}
return;
}
}