Update of /cvsroot/freenet/freenet/src/freenet/node
In directory sc8-pr-cvs1:/tmp/cvs-serv23587/freenet/src/freenet/node
Modified Files:
FailureTable.java
Log Message:
Make the HTML reflect the internal structure and hopefully a little easier on browsers.
Index: FailureTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/FailureTable.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- FailureTable.java 3 Nov 2003 02:45:25 -0000 1.23
+++ FailureTable.java 3 Nov 2003 05:48:55 -0000 1.24
@@ -204,14 +204,16 @@
}
public synchronized void writeHtml(PrintWriter pw) {
- pw.println("<b>max size:</b> " + maxSize + "<br>");
- pw.println("<b>current size:</b> " + failedKeys.size() + "<br>");
- pw.println("<b>seconds entries last:</b> " + maxMillis / 1000 +
"<br>");
- pw.println("<b>seconds between cleanings:</b> " + cpMillis / 1000 +
"<br>");
+ pw.println("<b>Maximum Keys:</b> " + maxSize + "<br>");
+ pw.println("<b>Current Keys:</b> " + failedKeys.size() + "<br>");
+ pw.println("<b>Maximum Key-HTL pairs:</b> " + maxItemsSize + "<br>");
+ pw.println("<b>Current Key-HTL pairs:</b> " + items.size() + "<br>");
+ pw.println("<b>Seconds Entries Persist:</b> " + maxMillis / 1000 +
"<br>");
+ pw.println("<b>Seconds Between Purges:</b> " + cpMillis / 1000 +
"<br>");
pw.println("<table border=1>");
- pw.println("<tr><th>Key</th><th>Blocked HTL</th>"
- + "<th>Age</th><th># of Blocks</th>"
- + "<th>lastHit</th></tr>");
+ pw.println("<tr><th>Key</th><th>Blocked HTLs</th>"
+ + "<th>Ages</th><th># of Blocks</th>"
+ + "<th>Last Hit</th></tr>");
FailureEntry fe;
long time = System.currentTimeMillis();
for(Enumeration e = entries.elements(); e.hasMoreElements(); ) {
@@ -239,16 +241,12 @@
}
/**
- * @param pw
+ * @param pw = PrintWriter to put HTML on
+ * @param time = current time, used to determine if it is in primary
or secondary failure table
*/
public void toHtml(PrintWriter pw, long time) {
- boolean active = (time - fe.lastFail) < maxMillis;
- pw.println("<tr><td><font color=\"" + (active ? "red" :
"green")
- + "\">" + fe.key + "</font></td><td>" +
hopsToLive
- + "</td><td>" + (time - this.time) / 1000
- + "</td><td>" + fe.blocks
- + "</td><td>" + new Date(fe.lastHit) +
"</td></tr>");
-
+ pw.println("<td>" + hopsToLive
+ + "</td><td>" + (time - this.time) / 1000 +
"</td>");
}
}
@@ -280,9 +278,19 @@
* @param pw
*/
public void toHtml(PrintWriter pw, long time) {
- for(Iterator i = myItems.iterator();i.hasNext();) {
- FailItem fi = (FailItem)(i.next());
- fi.toHtml(pw, time);
+ boolean active = (time - lastFail) < maxMillis;
+ pw.println("<tr><td rowspan="+myItems.size()+"><font color=\""
+ (active ? "red" : "green")
+ + "\">" + key + "</font></td>");
+ Iterator i = myItems.iterator();
+ if ( i.hasNext() ) {
+ ((FailItem)(i.next())).toHtml(pw,time);
+ }
+ pw.println("<td rowspan="+myItems.size()+">" + blocks
+ + "</td><td
rowspan="+myItems.size()+">" + new Date(lastHit) + "</td></tr>");
+ for ( ; i.hasNext(); ) {
+ pw.print("<tr>");
+ ((FailItem)(i.next())).toHtml(pw,time);
+ pw.print("</tr>\n");
}
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
