* Make graphs clickable to get larger graphs

* Change SimpleTimer CRIT to a WARN, increase threshold
    * Checklist update
This commit is contained in:
zzz
2008-02-13 11:49:24 +00:00
parent 43f2695901
commit d2f3a262db
5 changed files with 25 additions and 6 deletions

View File

@ -70,19 +70,32 @@ public class GraphHelper {
} }
if (hasTx && hasRx && !_showEvents) if (hasTx && hasRx && !_showEvents)
_out.write("<a href=\"viewstat.jsp?stat=bw.combined"
+ "&amp;periodCount=" + (3 * _periodCount )
+ "&amp;width=" + (3 * _width)
+ "&amp;height=" + (3 * _height)
+ "\" />");
_out.write("<img width=\"" _out.write("<img width=\""
+ (_width + 83) + "\" height=\"" + (_height + 92) + (_width + 83) + "\" height=\"" + (_height + 92)
+ "\" src=\"viewstat.jsp?stat=bw.combined" + "\" src=\"viewstat.jsp?stat=bw.combined"
+ "&amp;periodCount=" + _periodCount + "&amp;periodCount=" + _periodCount
+ "&amp;width=" + _width + "&amp;width=" + _width
+ "&amp;height=" + (_height - 14) + "&amp;height=" + (_height - 14)
+ "\" title=\"Combined bandwidth graph\" />\n"); + "\" title=\"Combined bandwidth graph\" /></a>\n");
for (Iterator iter = ordered.iterator(); iter.hasNext(); ) { for (Iterator iter = ordered.iterator(); iter.hasNext(); ) {
SummaryListener lsnr = (SummaryListener)iter.next(); SummaryListener lsnr = (SummaryListener)iter.next();
Rate r = lsnr.getRate(); Rate r = lsnr.getRate();
String title = r.getRateStat().getName() + " for " + DataHelper.formatDuration(_periodCount * r.getPeriod()); String title = r.getRateStat().getName() + " for " + DataHelper.formatDuration(_periodCount * r.getPeriod());
_out.write("<img width=\"" _out.write("<a href=\"viewstat.jsp?stat="
+ r.getRateStat().getName()
+ "&amp;showEvents=" + _showEvents
+ "&amp;period=" + r.getPeriod()
+ "&amp;periodCount=" + (3 * _periodCount)
+ "&amp;width=" + (3 * _width)
+ "&amp;height=" + (3 * _height)
+ "\" />");
_out.write("<img border=\"0\" width=\""
+ (_width + 83) + "\" height=\"" + (_height + 92) + (_width + 83) + "\" height=\"" + (_height + 92)
+ "\" src=\"viewstat.jsp?stat=" + "\" src=\"viewstat.jsp?stat="
+ r.getRateStat().getName() + r.getRateStat().getName()
@ -91,7 +104,7 @@ public class GraphHelper {
+ "&amp;periodCount=" + _periodCount + "&amp;periodCount=" + _periodCount
+ "&amp;width=" + _width + "&amp;width=" + _width
+ "&amp;height=" + _height + "&amp;height=" + _height
+ "\" title=\"" + title + "\" />\n"); + "\" title=\"" + title + "\" /></a>\n");
} }
if (_refreshDelaySeconds > 0) if (_refreshDelaySeconds > 0)
_out.write("<meta http-equiv=\"refresh\" content=\"" + _refreshDelaySeconds + "\" />\n"); _out.write("<meta http-equiv=\"refresh\" content=\"" + _refreshDelaySeconds + "\" />\n");

View File

@ -11,6 +11,7 @@ Change revision in:
installer/install.xml installer/install.xml
news.xml news.xml
router/java/src/net/i2p/router/RouterVersion.java router/java/src/net/i2p/router/RouterVersion.java
core/java/src/net/i2p/CoreVersion.java
Build and tag: Build and tag:
ant dist ant dist

View File

@ -207,11 +207,11 @@ public class SimpleTimer {
_occurredEventCount += eventsToFire.size(); _occurredEventCount += eventsToFire.size();
} else { } else {
_occurredTime = now; _occurredTime = now;
if (_occurredEventCount > 1000) { if (_occurredEventCount > 2500) {
StringBuffer buf = new StringBuffer(128); StringBuffer buf = new StringBuffer(128);
buf.append("Too many simpleTimerJobs (").append(_occurredEventCount); buf.append("Too many simpleTimerJobs (").append(_occurredEventCount);
buf.append(") in a second!"); buf.append(") in a second!");
_log.log(Log.CRIT, buf.toString()); _log.log(Log.WARN, buf.toString());
} }
_occurredEventCount = 0; _occurredEventCount = 0;
} }

View File

@ -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 2008-02-10 zzz
* Add new tunnel build algorithm (preliminary) * Add new tunnel build algorithm (preliminary)
* Change NTCP backlogged message from error to warning * Change NTCP backlogged message from error to warning

View File

@ -17,7 +17,7 @@ import net.i2p.CoreVersion;
public class RouterVersion { public class RouterVersion {
public final static String ID = "$Revision: 1.548 $ $Date: 2008-02-10 15:00:00 $"; 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 String VERSION = "0.6.1.31";
public final static long BUILD = 1; public final static long BUILD = 2;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID); System.out.println("Router ID: " + RouterVersion.ID);