Changeset 9d70a52


Ignore:
Timestamp:
Aug 27, 2008 7:55:47 PM (12 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
2c48831
Parents:
bf517411
Message:

netdb stats cleanup

File:
1 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/StatisticsManager.java

    rbf517411 r9d70a52  
    124124***/
    125125       
    126         boolean commentOutIn0621 = RouterVersion.VERSION.equals("0.6.2");
    127 
    128126        if (_includePeerRankings) {
    129127            if (false)
     
    132130            long publishedUptime = _context.router().getUptime();
    133131            // Don't publish these for first hour
    134             if (commentOutIn0621 || publishedUptime > 60*60*1000)
     132            if (publishedUptime > 60*60*1000)
    135133                includeThroughput(stats);
    136134            //includeRate("router.invalidMessageTime", stats, new long[] { 10*60*1000 });
     
    147145            //includeRate("tunnel.batchDelaySent", stats, new long[] { 10*60*1000, 60*60*1000 });
    148146            //includeRate("tunnel.batchMultipleCount", stats, new long[] { 10*60*1000, 60*60*1000 });
    149           if (commentOutIn0621)
    150             includeRate("tunnel.corruptMessage", stats, new long[] { 60*60*1000l, 3*60*60*1000l });
     147            //includeRate("tunnel.corruptMessage", stats, new long[] { 60*60*1000l, 3*60*60*1000l });
    151148           
    152149            //includeRate("router.throttleTunnelProbTestSlow", stats, new long[] { 60*60*1000 });
     
    164161            //includeRate("udp.addressTestInsteadOfUpdate", stats, new long[] { 1*60*1000 });
    165162
    166           if (commentOutIn0621)
    167             includeRate("clock.skew", stats, new long[] { 10*60*1000, 3*60*60*1000, 24*60*60*1000 });
     163            //includeRate("clock.skew", stats, new long[] { 10*60*1000, 3*60*60*1000, 24*60*60*1000 });
    168164           
    169165            //includeRate("transport.sendProcessingTime", stats, new long[] { 60*60*1000 });
    170166            //includeRate("jobQueue.jobRunSlow", stats, new long[] { 10*60*1000l, 60*60*1000l });
    171           if (commentOutIn0621)
    172             includeRate("crypto.elGamal.encrypt", stats, new long[] { 60*60*1000 });
     167            //includeRate("crypto.elGamal.encrypt", stats, new long[] { 60*60*1000 });
    173168            includeRate("tunnel.participatingTunnels", stats, new long[] { 5*60*1000, 60*60*1000 });
    174169            //includeRate("tunnel.testSuccessTime", stats, new long[] { 10*60*1000l });
    175           if (commentOutIn0621)
    176             includeRate("client.sendAckTime", stats, new long[] { 60*60*1000 }, true);
     170            //includeRate("client.sendAckTime", stats, new long[] { 60*60*1000 }, true);
    177171            //includeRate("udp.sendConfirmTime", stats, new long[] { 10*60*1000 });
    178172            //includeRate("udp.sendVolleyTime", stats, new long[] { 10*60*1000 });
     
    201195            includeRate("tunnel.buildExploratoryReject", stats, new long[] { 10*60*1000 });
    202196            includeRate("tunnel.buildExploratorySuccess", stats, new long[] { 10*60*1000 });
    203           if (commentOutIn0621) {
    204             includeRate("tunnel.rejectTimeout", stats, new long[] { 10*60*1000 });
    205             includeRate("tunnel.rejectOverloaded", stats, new long[] { 10*60*1000 });
    206             includeRate("tunnel.acceptLoad", stats, new long[] { 10*60*1000 });
    207           }
    208            
    209           // move this out of the if after 0.6.2.1 is out, so we get ff stats even if not publishing other stats
    210             if (FloodfillNetworkDatabaseFacade.isFloodfill(_context.router().getRouterInfo())) {
    211                 stats.setProperty("netdb.knownRouters", ""+_context.netDb().getKnownRouters());
    212                 stats.setProperty("netdb.knownLeaseSets", ""+_context.netDb().getKnownLeaseSets());
    213             }
     197            //includeRate("tunnel.rejectTimeout", stats, new long[] { 10*60*1000 });
     198            //includeRate("tunnel.rejectOverloaded", stats, new long[] { 10*60*1000 });
     199            //includeRate("tunnel.acceptLoad", stats, new long[] { 10*60*1000 });
    214200           
    215201            _log.debug("Publishing peer rankings");
     
    218204            stats.setProperty("stat_uptime", "90m");
    219205            _log.debug("Not publishing peer rankings");
    220           // delete after 0.6.2.1 is out
    221           if (!commentOutIn0621)
    222             if (FloodfillNetworkDatabaseFacade.isFloodfill(_context.router().getRouterInfo())) {
    223                 stats.setProperty("netdb.knownRouters", ""+_context.netDb().getKnownRouters());
    224                 stats.setProperty("netdb.knownLeaseSets", ""+_context.netDb().getKnownLeaseSets());
    225             }
     206        }
     207        if (FloodfillNetworkDatabaseFacade.isFloodfill(_context.router().getRouterInfo())) {
     208            stats.setProperty("netdb.knownRouters", ""+_context.netDb().getKnownRouters());
     209            stats.setProperty("netdb.knownLeaseSets", ""+_context.netDb().getKnownLeaseSets());
    226210        }
    227211
Note: See TracChangeset for help on using the changeset viewer.