Changeset eb32e2e2

Timestamp:

Dec 14, 2011 12:20:17 AM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

6da32a1

Parents:

27f0587 (diff), 6ce5e8b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge of '581e8c75800b84404730c41f6eb904fbc4e43804'

and 'fda7a0fe63b4cda793b7c15d5d263c211b2a0903'

Files:

• apps/routerconsole/jsp/help.jsp (modified) (1 diff)
• apps/routerconsole/jsp/help_fr.jsp (modified) (2 diffs)
• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java (modified) (1 diff)

apps/routerconsole/jsp/help.jsp

@@ -50 +50 @@
 The second number is the number of peers seen in the last hour or so.
 Do not be concerned if these numbers vary widely.
-First enable all stats to <a href="configstats.jsp#router.activePeers">[Enable graphing]</a>.</li>
+<a href="configstats.jsp#router.activePeers">[Enable graphing]</a>.</li>
 <li class="tidylist"><b>Fast:</b>
 This is the number of peers you use for building client tunnels. It is generally in the
 range 8-30. Your fast peers are shown on the <a href="profiles.jsp">profiles page</a>.
-<a href="configstats.jsp#router.fastPeers">[Enable graphing]</a>.</li>
+<a href="configstats.jsp#router.fastPeers">[Enable graphing]</a></li>
 <li class="tidylist"><b>High Capacity:</b>
 This is the number of peers you use for building some of your exploratory tunnels. It is generally in the
 range 8-75. The fast peers are included in the high capacity tier.
 Your high capacity peers are shown on the <a href="profiles.jsp">profiles page</a>.
-First enable all stats to <a href="configstats.jsp#router.highCapacityPeers">[Enable graphing]</a>.</li>
+<a href="configstats.jsp#router.highCapacityPeers">[Enable graphing]</a></li>
 <li class="tidylist"><b>Well Integrated:</b>
 This is the number of peers you use for network database inquiries.

apps/routerconsole/jsp/help_fr.jsp

@@ -44 +44 @@
 8-10 à plusieurs centaines, selon votre bande passante et son rapport de partage, et le trafic généré localement. Le 
 second est celui des pairs vus dans les dernières heures. Ces nombres penvent varier sensiblement sans conséquence.
-<a href="configstats.jsp#router.activePeers">[Activer le graphique]</a> (activer auparavant "toutes 
-les statistiques").</li>
+<a href="configstats.jsp#router.activePeers">[Activer le graphique]</a></li>
 <li class="tidylist"><b>Rapides:</b>
 le nombre de pairs que vous mettez à contribution pour construire vos tunnels clients. En général dans une tranche de 
@@ -54 +53 @@
 Les pairs rapides font partie du groupe des "Hautes capacités". Vos pairs à hautes capacités sont aussi listés sur 
 la page <a href="profiles.jsp">profils</a>.
-<a href="configstats.jsp#router.highCapacityPeers">[Activer le graphique]</a>  (activer auparavant "toutes les 
-statistiques").</li>
+<a href="configstats.jsp#router.highCapacityPeers">[Activer le graphique]</a></li>
 <li class="tidylist"><b>Bien intégrés:</b>
 vous utilisez ce groupe pour vos requêtes à la base de données du réseau. Ils sont souvent des pairs de remplissage par 

history.txt

@@ +1 @@
+2011-12-13 kytv
+  * Don't require that full stats are enabled to be able to graph
+    router.highCapacityPeers. (closes #450)
+
 2011-12-12 kytv
   * German and Spanish translation updates from Transifex

router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java

@@ -36 +36 @@
         ctx.statManager().createRequiredRateStat("bw.recvRate", _x("Low-level receive rate (bytes/sec)"), "Bandwidth", new long[] { 60*1000l, 5*60*1000l, 10*60*1000l, 60*60*1000l });
         ctx.statManager().createRequiredRateStat("router.activePeers", _x("How many peers we are actively talking with"), "Throttle", new long[] { 60*1000, 5*60*1000, 60*60*1000 });
+        ctx.statManager().createRequiredRateStat("router.highCapacityPeers", "How many high capacity peers we know", "Throttle", new long[] { 5*60*1000, 60*60*1000 });
         ctx.statManager().createRateStat("router.activeSendPeers", "How many peers we've sent to this minute", "Throttle", new long[] { 60*1000, 5*60*1000, 60*60*1000 });
-        ctx.statManager().createRateStat("router.highCapacityPeers", "How many high capacity peers we know", "Throttle", new long[] { 5*60*1000, 60*60*1000 });
         ctx.statManager().createRequiredRateStat("router.fastPeers", _x("Known fast peers"), "Throttle", new long[] { 5*60*1000, 60*60*1000 });
         _maxMemory = Runtime.getRuntime().maxMemory();