I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

post-0.6.5 netdb stats cleanup

Browse Source
This commit is contained in:
zzz
2008-12-02 16:25:16 +00:00
parent 5acc56c184
commit 7fdbe9b87b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
router/java/src/net/i2p/router/StatisticsManager.java
View File

@ -91,8 +91,6 @@ public class StatisticsManager implements Service {
} }
} }
static final boolean CommentOutIn065 = RouterVersion.VERSION.equals("0.6.4");
/** Retrieve a snapshot of the statistics that should be published */ /** Retrieve a snapshot of the statistics that should be published */
public Properties publishStatistics() { public Properties publishStatistics() {
Properties stats = new Properties(); Properties stats = new Properties();
@ -186,8 +184,7 @@ public class StatisticsManager implements Service {
//includeRate("udp.packetDequeueTime", stats, new long[] { 60*1000 }); //includeRate("udp.packetDequeueTime", stats, new long[] { 60*1000 });
//includeRate("udp.packetVerifyTime", stats, new long[] { 60*1000 }); //includeRate("udp.packetVerifyTime", stats, new long[] { 60*1000 });
if(CommentOutIn065) //includeRate("tunnel.buildRequestTime", stats, new long[] { 10*60*1000 });
includeRate("tunnel.buildRequestTime", stats, new long[] { 10*60*1000 });
includeRate("tunnel.buildClientExpire", stats, new long[] { 10*60*1000 }); includeRate("tunnel.buildClientExpire", stats, new long[] { 10*60*1000 });
includeRate("tunnel.buildClientReject", stats, new long[] { 10*60*1000 }); includeRate("tunnel.buildClientReject", stats, new long[] { 10*60*1000 });
includeRate("tunnel.buildClientSuccess", stats, new long[] { 10*60*1000 }); includeRate("tunnel.buildClientSuccess", stats, new long[] { 10*60*1000 });
@ -280,11 +277,13 @@ public class StatisticsManager implements Service {
private void includeThroughput(Properties stats) { private void includeThroughput(Properties stats) {
RateStat sendRate = _context.statManager().getRate("bw.sendRate"); RateStat sendRate = _context.statManager().getRate("bw.sendRate");
if (sendRate != null) { if (sendRate != null) {
if (CommentOutIn065 && _context.router().getUptime() > 5*60*1000) { /****
if (_context.router().getUptime() > 5*60*1000) {
Rate r = sendRate.getRate(5*60*1000); Rate r = sendRate.getRate(5*60*1000);
if (r != null) if (r != null)
stats.setProperty("stat_bandwidthSendBps.5m", num(r.getAverageValue()) + ';' + num(r.getExtremeAverageValue()) + ";0;0;"); stats.setProperty("stat_bandwidthSendBps.5m", num(r.getAverageValue()) + ';' + num(r.getExtremeAverageValue()) + ";0;0;");
} }
****/
if (_context.router().getUptime() > 60*60*1000) { if (_context.router().getUptime() > 60*60*1000) {
Rate r = sendRate.getRate(60*60*1000); Rate r = sendRate.getRate(60*60*1000);
if (r != null) if (r != null)
@ -294,11 +293,13 @@ public class StatisticsManager implements Service {
RateStat recvRate = _context.statManager().getRate("bw.recvRate"); RateStat recvRate = _context.statManager().getRate("bw.recvRate");
if (recvRate != null) { if (recvRate != null) {
if (CommentOutIn065 && _context.router().getUptime() > 5*60*1000) { /****
if (_context.router().getUptime() > 5*60*1000) {
Rate r = recvRate.getRate(5*60*1000); Rate r = recvRate.getRate(5*60*1000);
if (r != null) if (r != null)
stats.setProperty("stat_bandwidthReceiveBps.5m", num(r.getAverageValue()) + ';' + num(r.getExtremeAverageValue()) + ";0;0;"); stats.setProperty("stat_bandwidthReceiveBps.5m", num(r.getAverageValue()) + ';' + num(r.getExtremeAverageValue()) + ";0;0;");
} }
****/
if (_context.router().getUptime() > 60*60*1000) { if (_context.router().getUptime() > 60*60*1000) {
Rate r = recvRate.getRate(60*60*1000); Rate r = recvRate.getRate(60*60*1000);
if (r != null) if (r != null)