[freenet-CVS] freenet/src/freenet/client/http NodeStatusServlet.java, 1.84, 1.85

[Matthew Toseland]

Update of /cvsroot/freenet/freenet/src/freenet/client/http
In directory sc8-pr-cvs1:/tmp/cvs-serv13668/src/freenet/client/http

Modified Files:
        NodeStatusServlet.java 
Log Message:
6333: Implement exponential backoff.

Index: NodeStatusServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/NodeStatusServlet.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -w -r1.84 -r1.85
--- NodeStatusServlet.java      13 Nov 2003 12:02:52 -0000      1.84
+++ NodeStatusServlet.java      13 Nov 2003 20:49:54 -0000      1.85
@@ -1246,9 +1246,8 @@
         pw.println("</table>");
         
         pw.println("<table>");
-        String[] colors = { "blue", "green", "", "red" };
-        String[] meanings = { "Fetching ARK", "OK", "Not tried yet", 
-                              "Failing" };
+        String[] colors = { "green", "", "red" };
+        String[] meanings = { "OK", "No connections", "Backed Off" };
         for(int x=0; x<colors.length;x++) {
             StringBuffer s = new StringBuffer("<tr><td>");
             if(!colors[x].equals(""))
@@ -1859,6 +1858,7 @@
         boolean isNGRT = rtType.equals("freenet.node.rt.NGRoutingTable");
         int ngrtadd = isNGRT?2:0;
         NodeReference ref = null;
+        boolean hasOpenConns = false;
         if (isCPRT || isNGRT) {
             if (refValues[2+ngrtadd].equals(ZERO)) {
                 refValues[2+ngrtadd] = "none";
@@ -1870,6 +1870,7 @@
             if(refValues[colJoin].equals("0/0")) {
                 refValues[colJoin] = "<font color=\"red\">0/0</font>";
             } else {
+               hasOpenConns = true;
                 refValues[colJoin] = "<font color=\"green\">"+refValues[colJoin]+
                     "</font>";
             } 
@@ -1952,6 +1953,17 @@
                 "\">"+refValues[0]+"</a>";
                        refValues[18] = ((String)refValues[18]).replaceAll(" 
","&nbsp;");
                        refValues[19] = ((String)refValues[19]).replaceAll(" 
","&nbsp;");
+                       long l = ((Long)(refValues[20])).longValue();
+                       boolean backedOff = false;
+                       if(l == 0) refValues[20] = "live";
+                       else {
+                               backedOff = true;
+                               refValues[1] = "<font color=\"red\">"+refValues[1] + 
"</font>";
+                               refValues[20] = Long.toString(l/1000)+" seconds";
+                       }
+                       if(hasOpenConns && !backedOff)
+                               refValues[1] = "<font 
color=\"green\">"+refValues[1]+"</font>";
+                       refValues[21] = refValues[21].toString()+"ms";
         }
         
 //        // WTF?

_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs