i2p/i2p.i2p
1
0
Fork 0
mirror of https://github.com/i2p/i2p.i2p.git synced 2024-12-06 19:27:00 +01:00
Code Issues Actions 297 Packages Projects Releases Wiki Activity

Graphs: Fix RRD time skew handling

Browse Source 
rrd4j throws different exception than jrobin did
This commit is contained in:
zzz
2022-12-10 17:29:07 -05:00
parent 01618c6202
commit 897ea797cb
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java
+13 -5
View File
@@ -86,11 +86,19 @@ public class SummaryListener implements RateSummaryListener {
} catch (IllegalArgumentException iae) {
// ticket #1186
// apparently a corrupt file, thrown from update()
_log.error("Error adding", iae);
String path = _isPersistent ? _db.getPath() : null;
stopListening();
if (path != null)
(new File(path)).delete();
// With rrd4j, could be time skew:
// IllegalArgumentException: Bad sample time: 1670674936. Last update time was 1670694462, at least one second step is required
String msg = iae.getMessage();
if (msg != null && msg.startsWith("Bad sample time:")) {
if (_log.shouldWarn())
_log.warn("RRD time skew", iae);
} else {
_log.error("RRD error", iae);
String path = _isPersistent ? _db.getPath() : null;
stopListening();
if (path != null)
(new File(path)).delete();
}
} catch (RrdException re) {
// this can happen after the time slews backwards, so don't make it an error
// org.jrobin.core.RrdException: Bad sample timestamp 1264343107. Last update time was 1264343172, at least one second step is required