From bdbbe148c324d24237c1768bdc053489af2652cb Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Sat, 4 Feb 2023 08:58:46 -0500
Subject: [PATCH] Profiles: Make DBHistory rates final
---
.../net/i2p/router/peermanager/DBHistory.java | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/router/java/src/net/i2p/router/peermanager/DBHistory.java b/router/java/src/net/i2p/router/peermanager/DBHistory.java
index 156c2e4595..096aa4980c 100644
--- a/router/java/src/net/i2p/router/peermanager/DBHistory.java
+++ b/router/java/src/net/i2p/router/peermanager/DBHistory.java
@@ -18,8 +18,8 @@ public class DBHistory {
private final RouterContext _context;
//private long _successfulLookups;
//private long _failedLookups;
- private RateStat _failedLookupRate;
- private RateStat _invalidReplyRate;
+ private final RateStat _failedLookupRate;
+ private final RateStat _invalidReplyRate;
//private long _lookupReplyNew;
//private long _lookupReplyOld;
//private long _lookupReplyDuplicate;
@@ -40,7 +40,8 @@ public class DBHistory {
_log = context.logManager().getLog(DBHistory.class);
_statGroup = statGroup;
//_lastLookupReceived = -1;
- createRates(statGroup);
+ _failedLookupRate = new RateStat("dbHistory.failedLookupRate", "How often does this peer to respond to a lookup?", statGroup, new long[] { 10*60*1000l, 60*60*1000l, 24*60*60*1000l });
+ _invalidReplyRate = new RateStat("dbHistory.invalidReplyRate", "How often does this peer give us a bad (nonexistant, forged, etc) peer?", statGroup, new long[] { 30*60*1000l });
}
/** how many times we have sent them a db lookup and received the value back from them
@@ -315,18 +316,10 @@ public class DBHistory {
try {
_invalidReplyRate.load(props, "dbHistory.invalidReplyRate", true);
} catch (IllegalArgumentException iae) {
- _log.warn("DB History invalid reply rate is corrupt, resetting", iae);
- createRates(_statGroup);
+ _log.warn("DB History invalid reply rate is corrupt", iae);
}
}
- private synchronized void createRates(String statGroup) {
- if (_failedLookupRate == null)
- _failedLookupRate = new RateStat("dbHistory.failedLookupRate", "How often does this peer to respond to a lookup?", statGroup, new long[] { 10*60*1000l, 60*60*1000l, 24*60*60*1000l });
- if (_invalidReplyRate == null)
- _invalidReplyRate = new RateStat("dbHistory.invalidReplyRate", "How often does this peer give us a bad (nonexistant, forged, etc) peer?", statGroup, new long[] { 30*60*1000l });
- }
-
private final static long getLong(Properties props, String key) {
return ProfilePersistenceHelper.getLong(props, key);
}
--
GitLab