Changeset d4bbdc28


Ignore:
Timestamp:
Feb 16, 2015 5:27:17 PM (5 years ago)
Author:
dg2-new <dg2-new@…>
Branches:
master
Children:
2f90b5a
Parents:
f41df96
Message:

FloodfillMonitorJob?: use the 60 min rate avg instead of lifetime avg, but fallback to the lifetime.
SAMStreamSend: fix tabbing from earlier commit.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java

    rf41df96 rd4bbdc28  
    175175       
    176176        public boolean openConnection() {
    177                         FileInputStream fin = null;
     177            FileInputStream fin = null;
    178178            try {
    179179                fin = new FileInputStream(_destFile);
  • router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java

    rf41df96 rd4bbdc28  
    3232    private static final long MIN_UPTIME = 2*60*60*1000;
    3333    private static final long MIN_CHANGE_DELAY = 6*60*60*1000;
     34
    3435    private static final int MIN_FF = 5000;
    3536    private static final int MAX_FF = 999999;
     
    152153        // TODO - limit may still be too high
    153154        // For reference, the avg lifetime job lag on my Pi is 6.
    154         // Would per-hour or per-day be better than lifetime avg? A reference to avg. dropped ff jobs maybe?
     155        // Should we consider avg. dropped ff jobs?
    155156        RateStat lagStat = getContext().statManager().getRate("jobQueue.jobLag");
    156         happy = happy && lagStat.getLifetimeAverageValue() < 25;
     157        happy = happy && lagStat.getRate(60*60*1000L).getAvgOrLifetimeAvg() < 25;
    157158        happy = happy && getContext().tunnelManager().getInboundBuildQueueSize() < 5;
    158159        // Only if we're pretty well integrated...
Note: See TracChangeset for help on using the changeset viewer.