From 6ce5e8bd03e3ec3739a61917406f3dca58b5d439 Mon Sep 17 00:00:00 2001 From: kytv Date: Tue, 13 Dec 2011 23:08:41 +0000 Subject: [PATCH] Don't require that full stats need to enabled in order to graph high capacity peers. (closes #450) --- apps/routerconsole/jsp/help.jsp | 6 +++--- apps/routerconsole/jsp/help_fr.jsp | 6 ++---- history.txt | 4 ++++ .../java/src/net/i2p/router/tasks/CoalesceStatsEvent.java | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp index f6f74a25d1..9a8f97afb9 100644 --- a/apps/routerconsole/jsp/help.jsp +++ b/apps/routerconsole/jsp/help.jsp @@ -49,16 +49,16 @@ This may range from 8-10 to several hundred, depending on your total bandwidth, shared bandwidth, and locally-generated traffic. 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 [Enable graphing]. +[Enable graphing].
  • Fast: 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 profiles page. -[Enable graphing].
    • +[Enable graphing]
  • High Capacity: 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 profiles page. -First enable all stats to [Enable graphing].
    • +[Enable graphing]
  • Well Integrated: This is the number of peers you use for network database inquiries. These are usually the "floodfill" peers. diff --git a/apps/routerconsole/jsp/help_fr.jsp b/apps/routerconsole/jsp/help_fr.jsp index 3f9c8fc5b3..74ff18b400 100644 --- a/apps/routerconsole/jsp/help_fr.jsp +++ b/apps/routerconsole/jsp/help_fr.jsp @@ -43,8 +43,7 @@ Plus d'infos sur la page de configuration. le premier nombre est celui des routeurs avec qui le votre a communiqué dans les dernières minutes. Ça peut varier de 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. -[Activer le graphique] (activer auparavant "toutes -les statistiques").
    • +[Activer le graphique]
  • Rapides: le nombre de pairs que vous mettez à contribution pour construire vos tunnels clients. En général dans une tranche de 8 à 30. Vos pairs rapides sont détaillés sur la page profils. @@ -53,8 +52,7 @@ le nombre de pairs que vous mettez à contribution pour construire vos tunnels c nombre des pairs que vous utilisez pour construire quelques uns de vos tunnels exploratoires. Habituellement de 8 à 75. Les pairs rapides font partie du groupe des "Hautes capacités". Vos pairs à hautes capacités sont aussi listés sur la page profils. -[Activer le graphique] (activer auparavant "toutes les -statistiques").
    • +[Activer le graphique]
  • Bien intégrés: vous utilisez ce groupe pour vos requêtes à la base de données du réseau. Ils sont souvent des pairs de remplissage par diffusion ("floodfill"). Vos pairs "bien intégrés" sont affichés en bas de la même page diff --git a/history.txt b/history.txt index ddfc379063..a45cdd5bae 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +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 diff --git a/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java b/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java index bb6613f1fa..668536de3d 100644 --- a/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java +++ b/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java @@ -35,8 +35,8 @@ public class CoalesceStatsEvent implements SimpleTimer.TimedEvent { ctx.statManager().createRequiredRateStat("bw.sendRate", _x("Low-level send rate (bytes/sec)"), "Bandwidth", new long[] { 60*1000l, 5*60*1000l, 10*60*1000l, 60*60*1000l }); 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(); String legend = "(Bytes)";