diff --git a/router/java/src/net/i2p/router/JobImpl.java b/router/java/src/net/i2p/router/JobImpl.java index b122d3674afa78cf1d31732544066a1d7579d362..2f99a53571eeefa68784fd63c451b95179eed08b 100644 --- a/router/java/src/net/i2p/router/JobImpl.java +++ b/router/java/src/net/i2p/router/JobImpl.java @@ -39,11 +39,21 @@ public abstract class JobImpl implements Job { return buf.toString(); } + /** + * @deprecated + * As of 0.8.1, this is a noop, as it just adds classes to the log manager + * class list for no good reason. Logging in jobs is almost always + * set explicitly rather than by class name. + */ void addedToQueue() { - if (_context.logManager().getLog(getClass()).shouldLog(Log.DEBUG)) - _addedBy = new Exception(); + //if (_context.logManager().getLog(getClass()).shouldLog(Log.DEBUG)) + // _addedBy = new Exception(); } + /** + * @deprecated + * @return null always + */ public Exception getAddedBy() { return _addedBy; } public long getMadeReadyOn() { return _madeReadyOn; } public void madeReady() { _madeReadyOn = _context.clock().now(); } diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java index 892a678edc094837c560de06d2a7b573a3933484..a8b5395b00c6c5cb114ad2b4776aed8ac02fe0fb 100644 --- a/router/java/src/net/i2p/router/JobQueue.java +++ b/router/java/src/net/i2p/router/JobQueue.java @@ -142,8 +142,9 @@ public class JobQueue { public void addJob(Job job) { if (job == null || !_alive) return; - if (job instanceof JobImpl) - ((JobImpl)job).addedToQueue(); + // This does nothing + //if (job instanceof JobImpl) + // ((JobImpl)job).addedToQueue(); long numReady = 0; boolean alreadyExists = false; diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java index f363bd27814dfd7600f4a85126ffa42e214c3cf6..42eef3480bd5d1cd818bc4615e4fb969222f21bb 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -590,7 +590,7 @@ public class ClientConnectionRunner { + " for session [" + _sessionId.getSessionId() + "] (with nonce=2), retrying after [" + (_context.clock().now() - _lastTried) - + "]", getAddedBy()); + + "]"); } else { if (_log.shouldLog(Log.DEBUG)) _log.debug("Updating message status for message " + _messageId + " to " diff --git a/router/java/src/net/i2p/router/message/SendMessageDirectJob.java b/router/java/src/net/i2p/router/message/SendMessageDirectJob.java index be1b1e3eb223b46783106f9243efd52ffbd3970d..c67eeaa4ad986d0fa6cd57f8a512c791176ae4f7 100644 --- a/router/java/src/net/i2p/router/message/SendMessageDirectJob.java +++ b/router/java/src/net/i2p/router/message/SendMessageDirectJob.java @@ -76,7 +76,7 @@ public class SendMessageDirectJob extends JobImpl { if (_expiration < now) { if (_log.shouldLog(Log.WARN)) _log.warn("Timed out sending message " + _message + " directly (expiration = " - + new Date(_expiration) + ") to " + _targetHash.toBase64(), getAddedBy()); + + new Date(_expiration) + ") to " + _targetHash.toBase64()); if (_onFail != null) getContext().jobQueue().addJob(_onFail); return; @@ -104,7 +104,7 @@ public class SendMessageDirectJob extends JobImpl { if (_log.shouldLog(Log.WARN)) _log.warn("Unable to find the router to send to: " + _targetHash + " after searching for " + (getContext().clock().now()-_searchOn) - + "ms, message: " + _message, getAddedBy()); + + "ms, message: " + _message); if (_onFail != null) getContext().jobQueue().addJob(_onFail); } diff --git a/router/java/src/net/i2p/router/tunnel/pool/TestJob.java b/router/java/src/net/i2p/router/tunnel/pool/TestJob.java index ba3eda6d666a635707f491a0ee19feb5a781659b..74910cbcbbc805f0da9e31b7e5f80275c9ce1f3c 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TestJob.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TestJob.java @@ -317,7 +317,7 @@ class TestJob extends JobImpl { public String getName() { return "Tunnel test timeout"; } public void runJob() { if (_log.shouldLog(Log.WARN)) - _log.warn("Timeout: found? " + _found, getAddedBy()); + _log.warn("Timeout: found? " + _found); if (!_found) { // don't clog up the SKM with old one-tag tagsets if (_cfg.isInbound() && !_pool.getSettings().isExploratory()) { diff --git a/router/java/test/net/i2p/router/message/SendGarlicJob.java b/router/java/test/net/i2p/router/message/SendGarlicJob.java index 6b0aa0b3752b92bef452a8a5173a2a757c583436..f4839a522decc94eb7ec5846b2627db723c098f8 100644 --- a/router/java/test/net/i2p/router/message/SendGarlicJob.java +++ b/router/java/test/net/i2p/router/message/SendGarlicJob.java @@ -81,7 +81,7 @@ public class SendGarlicJob extends JobImpl { long after = getContext().clock().now(); if ( (after - before) > 1000) { if (_log.shouldLog(Log.WARN)) - _log.warn("Building the garlic took too long [" + (after-before)+" ms]", getAddedBy()); + _log.warn("Building the garlic took too long [" + (after-before)+" ms]"); } else { if (_log.shouldLog(Log.DEBUG)) _log.debug("Building the garlic was fast! " + (after - before) + " ms");