From ebb6609a2b69a25fe49120b05fee99c63ec1540b Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 29 Jun 2012 14:05:39 +0000
Subject: [PATCH] fix SimpleTimer logging
---
core/java/src/net/i2p/util/Executor.java | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/core/java/src/net/i2p/util/Executor.java b/core/java/src/net/i2p/util/Executor.java
index 1bff875578..463882a25c 100644
--- a/core/java/src/net/i2p/util/Executor.java
+++ b/core/java/src/net/i2p/util/Executor.java
@@ -9,12 +9,13 @@ import net.i2p.I2PAppContext;
*/
class Executor implements Runnable {
private final I2PAppContext _context;
- private Log _log;
- private final List _readyEvents;
+ private final Log _log;
+ private final List<SimpleTimer.TimedEvent> _readyEvents;
private final SimpleStore runn;
- public Executor(I2PAppContext ctx, Log log, List events, SimpleStore x) {
+ public Executor(I2PAppContext ctx, Log log, List<SimpleTimer.TimedEvent> events, SimpleStore x) {
_context = ctx;
+ _log = log;
_readyEvents = events;
runn = x;
}
@@ -26,7 +27,7 @@ class Executor implements Runnable {
if (_readyEvents.isEmpty())
try { _readyEvents.wait(); } catch (InterruptedException ie) {}
if (!_readyEvents.isEmpty())
- evt = (SimpleTimer.TimedEvent)_readyEvents.remove(0);
+ evt = _readyEvents.remove(0);
}
if (evt != null) {
@@ -34,21 +35,12 @@ class Executor implements Runnable {
try {
evt.timeReached();
} catch (Throwable t) {
- log("Executing task " + evt + " exited unexpectedly, please report", t);
+ _log.error("Executing task " + evt + " exited unexpectedly, please report", t);
}
long time = _context.clock().now() - before;
- // FIXME _log won't be non-null unless we already had a CRIT
- if ( (time > 1000) && (_log != null) && (_log.shouldLog(Log.WARN)) )
+ if ( (time > 1000) && (_log.shouldLog(Log.WARN)) )
_log.warn("wtf, event execution took " + time + ": " + evt);
}
}
}
-
- private void log(String msg, Throwable t) {
- synchronized (this) {
- if (_log == null)
- _log = I2PAppContext.getGlobalContext().logManager().getLog(SimpleTimer.class);
- }
- _log.log(Log.CRIT, msg, t);
- }
}
--
GitLab