[freenet-cvs] r12208 - trunk/freenet/src/freenet/clients/http

[zot...@freenetproject.org]

Author: zothar
Date: 2007-03-18 19:40:45 +0000 (Sun, 18 Mar 2007)
New Revision: 12208

Modified:
   trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
   trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
   trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
Log:
Bug 1195: Show insert/request limits

Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2007-03-18 19:20:51 UTC (rev 12207)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java       
2007-03-18 19:40:45 UTC (rev 12208)
@@ -196,10 +196,10 @@
                        } else {
                                HTMLNode activityList = 
activityInfoboxContent.addChild("ul");
                                if (numInserts > 0) {
-                                       activityList.addChild("li", 
"Inserts:\u00a0" + numInserts);
+                                       activityList.addChild("li", 
"Inserts:\u00a0" + numInserts+'/'+Node.MAX_RUNNING_INSERTS);
                                }
                                if (numRequests > 0) {
-                                       activityList.addChild("li", 
"Requests:\u00a0" + numRequests);
+                                       activityList.addChild("li", 
"Requests:\u00a0" + numRequests+'/'+Node.MAX_RUNNING_REQUESTS);
                                }
                                if (numTransferringRequests > 0) {
                                        activityList.addChild("li", 
"Transferring\u00a0Requests:\u00a0" + numTransferringRequests);

Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2007-03-18 19:20:51 UTC (rev 12207)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2007-03-18 19:40:45 UTC (rev 12208)
@@ -197,10 +197,10 @@
                        } else {
                                HTMLNode activityList = 
activityInfoboxContent.addChild("ul");
                                if (numInserts > 0) {
-                                       activityList.addChild("li", 
"Inserts:\u00a0" + numInserts);
+                                       activityList.addChild("li", 
"Inserts:\u00a0" + numInserts+'/'+Node.MAX_RUNNING_INSERTS);
                                }
                                if (numRequests > 0) {
-                                       activityList.addChild("li", 
"Requests:\u00a0" + numRequests);
+                                       activityList.addChild("li", 
"Requests:\u00a0" + numRequests+'/'+Node.MAX_RUNNING_REQUESTS);
                                }
                                if (numTransferringRequests > 0) {
                                        activityList.addChild("li", 
"Transferring\u00a0Requests:\u00a0" + numTransferringRequests);

Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2007-03-18 
19:20:51 UTC (rev 12207)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2007-03-18 
19:40:45 UTC (rev 12208)
@@ -599,8 +599,8 @@
                HTMLNode activityBox = 
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-information", 
"Current Activity"));
                HTMLNode activityContent = 
ctx.getPageMaker().getContentNode(activityBox);
                HTMLNode activityList = activityContent.addChild("ul", "id", 
"activity");
-               activityList.addChild("li", "Inserts: " + node.getNumInserts());
-               activityList.addChild("li", "Requests: " + 
node.getNumRequests());
+               activityList.addChild("li", "Inserts: " + 
node.getNumInserts()+'/'+Node.MAX_RUNNING_INSERTS);
+               activityList.addChild("li", "Requests: " + 
node.getNumRequests()+'/'+Node.MAX_RUNNING_REQUESTS);
                activityList.addChild("li", "Transferring Requests: " + 
node.getNumTransferringRequests());
                if (advancedModeOutputEnabled) {
                        activityList.addChild("li", "ARK Fetch Requests: " + 
node.getNumARKFetchers());