diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java index 78da276b0..e9c603c89 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java @@ -70,19 +70,32 @@ public class GraphHelper { } if (hasTx && hasRx && !_showEvents) + _out.write(""); _out.write("\n"); + + "\" title=\"Combined bandwidth graph\" />\n"); for (Iterator iter = ordered.iterator(); iter.hasNext(); ) { SummaryListener lsnr = (SummaryListener)iter.next(); Rate r = lsnr.getRate(); String title = r.getRateStat().getName() + " for " + DataHelper.formatDuration(_periodCount * r.getPeriod()); - _out.write(""); + _out.write("\n"); + + "\" title=\"" + title + "\" />\n"); } if (_refreshDelaySeconds > 0) _out.write("\n"); diff --git a/checklist.txt b/checklist.txt index 50b07c210..a17ad672b 100644 --- a/checklist.txt +++ b/checklist.txt @@ -11,6 +11,7 @@ Change revision in: installer/install.xml news.xml router/java/src/net/i2p/router/RouterVersion.java + core/java/src/net/i2p/CoreVersion.java Build and tag: ant dist diff --git a/core/java/src/net/i2p/util/SimpleTimer.java b/core/java/src/net/i2p/util/SimpleTimer.java index a228eb3ae..704f51163 100644 --- a/core/java/src/net/i2p/util/SimpleTimer.java +++ b/core/java/src/net/i2p/util/SimpleTimer.java @@ -207,11 +207,11 @@ public class SimpleTimer { _occurredEventCount += eventsToFire.size(); } else { _occurredTime = now; - if (_occurredEventCount > 1000) { + if (_occurredEventCount > 2500) { StringBuffer buf = new StringBuffer(128); buf.append("Too many simpleTimerJobs (").append(_occurredEventCount); buf.append(") in a second!"); - _log.log(Log.CRIT, buf.toString()); + _log.log(Log.WARN, buf.toString()); } _occurredEventCount = 0; } diff --git a/history.txt b/history.txt index 6109c2925..e50e8b2be 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,8 @@ +2008-02-13 zzz + * Make graphs clickable to get larger graphs + * Change SimpleTimer CRIT to a WARN, increase threshold + * Checklist update + 2008-02-10 zzz * Add new tunnel build algorithm (preliminary) * Change NTCP backlogged message from error to warning diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 8c95f8e9c..883303278 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -17,7 +17,7 @@ import net.i2p.CoreVersion; public class RouterVersion { public final static String ID = "$Revision: 1.548 $ $Date: 2008-02-10 15:00:00 $"; public final static String VERSION = "0.6.1.31"; - public final static long BUILD = 1; + public final static long BUILD = 2; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("Router ID: " + RouterVersion.ID);