From d8e06a0d1476db422e0c5643bce2853a42cd4a0a Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 24 Jun 2019 14:33:56 +0000 Subject: [PATCH] Deprecate unused StatLog --- core/java/src/net/i2p/stat/BufferedStatLog.java | 3 +++ core/java/src/net/i2p/stat/RateStat.java | 5 +++++ router/java/src/net/i2p/router/peermanager/DBHistory.java | 2 -- router/java/src/net/i2p/router/peermanager/PeerProfile.java | 6 ------ .../java/src/net/i2p/router/peermanager/TunnelHistory.java | 2 -- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/core/java/src/net/i2p/stat/BufferedStatLog.java b/core/java/src/net/i2p/stat/BufferedStatLog.java index 5734e8948..9bf7afffc 100644 --- a/core/java/src/net/i2p/stat/BufferedStatLog.java +++ b/core/java/src/net/i2p/stat/BufferedStatLog.java @@ -18,6 +18,9 @@ import net.i2p.util.Log; /** * Note - if no filter is defined in stat.logFilters at startup, this class will not * be instantiated - see StatManager. + * + * Deprecated - unused - to be removed. + * Not for external use - not a public API. */ public class BufferedStatLog implements StatLog { private final I2PAppContext _context; diff --git a/core/java/src/net/i2p/stat/RateStat.java b/core/java/src/net/i2p/stat/RateStat.java index aaf06f1d3..8cd7dab17 100644 --- a/core/java/src/net/i2p/stat/RateStat.java +++ b/core/java/src/net/i2p/stat/RateStat.java @@ -38,6 +38,11 @@ public class RateStat { _rates[i] = rate; } } + + /** + * Sets the default stat log for this RateStat. + * Deprecated, unused, to be disabled in a future release. + */ public void setStatLog(StatLog sl) { _statLog = sl; } /** diff --git a/router/java/src/net/i2p/router/peermanager/DBHistory.java b/router/java/src/net/i2p/router/peermanager/DBHistory.java index f814ddd72..156c2e459 100644 --- a/router/java/src/net/i2p/router/peermanager/DBHistory.java +++ b/router/java/src/net/i2p/router/peermanager/DBHistory.java @@ -325,8 +325,6 @@ public class DBHistory { _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 }); - _failedLookupRate.setStatLog(_context.statManager().getStatLog()); - _invalidReplyRate.setStatLog(_context.statManager().getStatLog()); } private final static long getLong(Properties props, String key) { diff --git a/router/java/src/net/i2p/router/peermanager/PeerProfile.java b/router/java/src/net/i2p/router/peermanager/PeerProfile.java index 3a6c02fa7..71c9893b0 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerProfile.java +++ b/router/java/src/net/i2p/router/peermanager/PeerProfile.java @@ -482,10 +482,6 @@ public class PeerProfile { if (_tunnelHistory == null) _tunnelHistory = new TunnelHistory(_context, group); - //_sendSuccessSize.setStatLog(_context.statManager().getStatLog()); - //_receiveSize.setStatLog(_context.statManager().getStatLog()); - _tunnelCreateResponseTime.setStatLog(_context.statManager().getStatLog()); - _tunnelTestResponseTime.setStatLog(_context.statManager().getStatLog()); _expanded = true; } @@ -502,8 +498,6 @@ public class PeerProfile { if (_dbHistory == null) _dbHistory = new DBHistory(_context, group); - _dbResponseTime.setStatLog(_context.statManager().getStatLog()); - _dbIntroduction.setStatLog(_context.statManager().getStatLog()); _expandedDB = true; } diff --git a/router/java/src/net/i2p/router/peermanager/TunnelHistory.java b/router/java/src/net/i2p/router/peermanager/TunnelHistory.java index 4b5ba88d0..8d256c791 100644 --- a/router/java/src/net/i2p/router/peermanager/TunnelHistory.java +++ b/router/java/src/net/i2p/router/peermanager/TunnelHistory.java @@ -49,8 +49,6 @@ public class TunnelHistory { private void createRates(String statGroup) { _rejectRate = new RateStat("tunnelHistory.rejectRate", "How often does this peer reject a tunnel request?", statGroup, new long[] { 10*60*1000l, 30*60*1000l, 60*60*1000l, 24*60*60*1000l }); _failRate = new RateStat("tunnelHistory.failRate", "How often do tunnels this peer accepts fail?", statGroup, new long[] { 10*60*1000l, 30*60*1000l, 60*60*1000l, 24*60*60*1000l }); - _rejectRate.setStatLog(_context.statManager().getStatLog()); - _failRate.setStatLog(_context.statManager().getStatLog()); } /** total tunnels the peer has agreed to participate in */