Changeset 2586db9
- Timestamp:
- Jul 27, 2018 3:58:14 PM (3 years ago)
- Branches:
- master
- Children:
- 63f0355
- Parents:
- fc817b0
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
history.txt
rfc817b0 r2586db9 1 2018-07-27 zzz 2 * Console: Split netdb output into pages 3 * Router: Implement router.rejectStartupTime config (ticket #2285) 4 * Transport: Defer NTCP 1/2 classifiation until receiving 64 bytes 5 1 6 2018-07-21 zzz 2 7 * Build: Add check for libtaglibs package in debian builds -
router/java/src/net/i2p/router/RouterThrottleImpl.java
rfc817b0 r2586db9 20 20 private final Log _log; 21 21 private volatile String _tunnelStatus; 22 private final long _rejectStartupTime; 22 23 23 24 /** … … 34 35 private static final String PROP_MAX_PROCESSINGTIME = "router.defaultProcessingTimeThrottle"; 35 36 private static final long DEFAULT_REJECT_STARTUP_TIME = 10*60*1000; 37 private static final long MIN_REJECT_STARTUP_TIME = 90*1000; 36 38 private static final String PROP_REJECT_STARTUP_TIME = "router.rejectStartupTime"; 37 39 private static final int DEFAULT_MIN_THROTTLE_TUNNELS = SystemVersion.isAndroid() ? 100 : … … 54 56 _log = context.logManager().getLog(RouterThrottleImpl.class); 55 57 setTunnelStatus(); 56 _context.simpleTimer2().addEvent(new ResetStatus(), 5*1000 + _context.getProperty(PROP_REJECT_STARTUP_TIME, DEFAULT_REJECT_STARTUP_TIME)); 58 _rejectStartupTime = Math.max(MIN_REJECT_STARTUP_TIME, _context.getProperty(PROP_REJECT_STARTUP_TIME, DEFAULT_REJECT_STARTUP_TIME)); 59 _context.simpleTimer2().addEvent(new ResetStatus(), 5*1000 + _rejectStartupTime); 57 60 _context.statManager().createRateStat("router.throttleNetworkCause", "How lagged the jobQueue was when an I2NP was throttled", "Throttle", new long[] { 60*1000, 10*60*1000, 60*60*1000, 24*60*60*1000 }); 58 61 //_context.statManager().createRateStat("router.throttleNetDbCause", "How lagged the jobQueue was when a networkDb request was throttled", "Throttle", new long[] { 60*1000, 10*60*1000, 60*60*1000, 24*60*60*1000 }); … … 136 139 137 140 // Don't use CRIT because we don't want peers to think we're failing 138 if (_context.router().getUptime() < DEFAULT_REJECT_STARTUP_TIME) {141 if (_context.router().getUptime() < _rejectStartupTime) { 139 142 setTunnelStatus(_x("Rejecting tunnels: Starting up")); 140 143 return TunnelHistory.TUNNEL_REJECT_BANDWIDTH; -
router/java/src/net/i2p/router/RouterVersion.java
rfc817b0 r2586db9 19 19 public final static String ID = "Monotone"; 20 20 public final static String VERSION = CoreVersion.VERSION; 21 public final static long BUILD = 1 7;21 public final static long BUILD = 18; 22 22 23 23 /** for example "-test" */
Note: See TracChangeset
for help on using the changeset viewer.