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

Console: Delete rrd files for no-longer-configured stats at startup

Browse Source
This commit is contained in:
zzz
2021-01-11 10:21:54 -05:00
parent 66c4c10a78
commit 7fe01fb9a7
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
View File

@@ -1,6 +1,7 @@
package net.i2p.router.web;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Collections;
@@ -22,6 +23,7 @@ import net.i2p.router.RouterContext;
import static net.i2p.router.web.GraphConstants.*;
import net.i2p.stat.Rate;
import net.i2p.stat.RateStat;
import net.i2p.util.FileSuffixFilter;
import net.i2p.util.FileUtil;
import net.i2p.util.Log;
import net.i2p.util.SystemVersion;
@@ -91,6 +93,24 @@ public class StatSummarizer implements Runnable, ClientApp {
String spec = _context.getProperty("stat.summaries", DEFAULT_DATABASES);
String[] rates = DataHelper.split(spec, ",");
syncThreads = Math.min(rates.length / 2, 4);
// delete files for unconfigured rates
Set<String> configured = new HashSet<String>(rates.length);
for (String r : rates) {
configured.add(SummaryListener.createName(_context, r));
}
File rrdDir = new File(_context.getRouterDir(), SummaryListener.RRD_DIR);
FileFilter filter = new FileSuffixFilter(SummaryListener.RRD_PREFIX, SummaryListener.RRD_SUFFIX);
File[] files = rrdDir.listFiles(filter);
if (files != null) {
for (int i = 0; i < files.length; i++) {
File f = files[i];
String name = f.getName();
String hash = name.substring(SummaryListener.RRD_PREFIX.length(), name.length() - SummaryListener.RRD_SUFFIX.length());
if (!configured.contains(hash)) {
f.delete();
}
}
}
} else {
syncThreads = 0;
deleteOldRRDs();

4
apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java
View File

@@ -35,8 +35,8 @@ public class SummaryListener implements RateSummaryListener {
public static final String PROP_PERSISTENT = "routerconsole.graphPersistent";
/** note that .jrb files are NOT compatible with .rrd files */
static final String RRD_DIR = "rrd";
private static final String RRD_PREFIX = "rrd-";
private static final String RRD_SUFFIX = ".jrb";
static final String RRD_PREFIX = "rrd-";
static final String RRD_SUFFIX = ".jrb";
static final ConsolFun CF = ConsolFun.AVERAGE;
static final DsType DS = DsType.GAUGE;
private static final double XFF = 0.9d;