echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better throttle log msgs

Browse Source
This commit is contained in:
zzz
2012-05-09 21:07:33 +00:00
parent 047c668ee1
commit fc5e30e6ae
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java
View File

@ -319,19 +319,43 @@ class ConnectionManager {
// always call all 3 to increment all counters // always call all 3 to increment all counters
if (_minuteThrottler != null && _minuteThrottler.shouldThrottle(h)) { if (_minuteThrottler != null && _minuteThrottler.shouldThrottle(h)) {
_context.statManager().addRateData("stream.con.throttledMinute", 1, 0); _context.statManager().addRateData("stream.con.throttledMinute", 1, 0);
throttled = "throttled by per-peer limit of " + _defaultOptions.getMaxConnsPerMinute() + if (_defaultOptions.getMaxConnsPerMinute() <= 0)
throttled = "throttled by" +
" total limit of " + _defaultOptions.getMaxTotalConnsPerMinute() +
" per minute";
else if (_defaultOptions.getMaxTotalConnsPerMinute() <= 0)
throttled = "throttled by per-peer limit of " + _defaultOptions.getMaxConnsPerMinute() +
" per minute";
else
throttled = "throttled by per-peer limit of " + _defaultOptions.getMaxConnsPerMinute() +
" or total limit of " + _defaultOptions.getMaxTotalConnsPerMinute() + " or total limit of " + _defaultOptions.getMaxTotalConnsPerMinute() +
" per minute"; " per minute";
} }
if (_hourThrottler != null && _hourThrottler.shouldThrottle(h)) { if (_hourThrottler != null && _hourThrottler.shouldThrottle(h)) {
_context.statManager().addRateData("stream.con.throttledHour", 1, 0); _context.statManager().addRateData("stream.con.throttledHour", 1, 0);
throttled = "throttled by per-peer limit of " + _defaultOptions.getMaxConnsPerHour() + if (_defaultOptions.getMaxConnsPerHour() <= 0)
throttled = "throttled by" +
" total limit of " + _defaultOptions.getMaxTotalConnsPerHour() +
" per hour";
else if (_defaultOptions.getMaxTotalConnsPerHour() <= 0)
throttled = "throttled by per-peer limit of " + _defaultOptions.getMaxConnsPerHour() +
" per hour";
else
throttled = "throttled by per-peer limit of " + _defaultOptions.getMaxConnsPerHour() +
" or total limit of " + _defaultOptions.getMaxTotalConnsPerHour() + " or total limit of " + _defaultOptions.getMaxTotalConnsPerHour() +
" per hour"; " per hour";
} }
if (_dayThrottler != null && _dayThrottler.shouldThrottle(h)) { if (_dayThrottler != null && _dayThrottler.shouldThrottle(h)) {
_context.statManager().addRateData("stream.con.throttledDay", 1, 0); _context.statManager().addRateData("stream.con.throttledDay", 1, 0);
throttled = "throttled by per-peer limit of " + _defaultOptions.getMaxConnsPerDay() + if (_defaultOptions.getMaxConnsPerDay() <= 0)
throttled = "throttled by" +
" total limit of " + _defaultOptions.getMaxTotalConnsPerDay() +
" per day";
else if (_defaultOptions.getMaxTotalConnsPerDay() <= 0)
throttled = "throttled by per-peer limit of " + _defaultOptions.getMaxConnsPerDay() +
" per day";
else
throttled = "throttled by per-peer limit of " + _defaultOptions.getMaxConnsPerDay() +
" or total limit of " + _defaultOptions.getMaxTotalConnsPerDay() + " or total limit of " + _defaultOptions.getMaxTotalConnsPerDay() +
" per day"; " per day";
} }