Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-04 17:37:29 +02:00
Code Issues Projects Releases Wiki Activity

Added hash to Error files, reduced duplicate lines

Browse Source
This commit is contained in:
Risto Lahtela 2020-05-23 12:13:33 +03:00
parent 15e7d38043
commit 2e162aedb0
1 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Plan/common/src/main/java/com/djrapitops/plan/utilities/logging/ErrorLogger.java
View File

@ -36,10 +36,7 @@ import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.StandardOpenOption; import java.nio.file.StandardOpenOption;
import java.util.ArrayList; import java.util.*;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -88,9 +85,9 @@ public class ErrorLogger implements ErrorHandler {
Path errorLog = logsDir.resolve(errorName + "-" + hash + ".txt"); Path errorLog = logsDir.resolve(errorName + "-" + hash + ".txt");
mergeAdditionalContext(throwable, context); mergeAdditionalContext(throwable, context);
if (Files.exists(errorLog)) { if (Files.exists(errorLog)) {
logExisting(errorLog, throwable, context); logExisting(errorLog, throwable, context, hash);
} else { } else {
logNew(errorLog, throwable, context); logNew(errorLog, throwable, context, hash);
} }
logToConsole(level, errorLog, throwable, context); logToConsole(level, errorLog, throwable, context);
if (L.CRITICAL == level) { if (L.CRITICAL == level) {
@ -109,17 +106,17 @@ public class ErrorLogger implements ErrorHandler {
} }
} }
private void logExisting(Path errorLog, Throwable throwable, ErrorContext context) { private void logExisting(Path errorLog, Throwable throwable, ErrorContext context, String hash) {
// Read existing // Read existing
List<String> lines; List<String> lines;
try (Stream<String> read = Files.lines(errorLog)) { try (Stream<String> read = Files.lines(errorLog)) {
lines = read.collect(Collectors.toList()); lines = read.collect(Collectors.toList());
} catch (IOException e) { } catch (IOException e) {
logAfterReadError(errorLog, throwable, context); logAfterReadError(errorLog, throwable, context, hash);
return; return;
} }
int occurrences = getOccurrences(lines) + 1; int occurrences = getOccurrences(lines) + 1;
List<String> newLines = buildNewLines(context, lines, occurrences); List<String> newLines = buildNewLines(context, lines, occurrences, hash);
overwrite(errorLog, throwable, newLines); overwrite(errorLog, throwable, newLines);
} }
@ -132,9 +129,9 @@ public class ErrorLogger implements ErrorHandler {
} }
} }
private List<String> buildNewLines(ErrorContext context, List<String> lines, int occurrences) { private List<String> buildNewLines(ErrorContext context, List<String> lines, int occurrences, String hash) {
Lists.Builder<String> builder = Lists.builder(String.class) Lists.Builder<String> builder = Lists.builder(String.class)
.add("Last occurred: " + getTimeStamp() + " Occurrences: " + occurrences); .add(hash + " - Last occurred: " + getTimeStamp() + " Occurrences: " + occurrences);
// 5 contexts are enough. // 5 contexts are enough.
if (occurrences <= 5) { if (occurrences <= 5) {
builder = buildContext(context, occurrences, builder); builder = buildContext(context, occurrences, builder);
@ -159,14 +156,14 @@ public class ErrorLogger implements ErrorHandler {
.add(""); .add("");
} }
private void logAfterReadError(Path errorLog, Throwable throwable, ErrorContext context) { private void logAfterReadError(Path errorLog, Throwable throwable, ErrorContext context, String hash) {
logger.error("Failed to read " + errorLog + " deleting file"); logger.error("Failed to read " + errorLog + " deleting file");
try { try {
Files.deleteIfExists(errorLog); Files.deleteIfExists(errorLog);
} catch (IOException ioException) { } catch (IOException ioException) {
logger.error("Failed to delete " + errorLog); logger.error("Failed to delete " + errorLog);
} }
logNew(errorLog, throwable, context); logNew(errorLog, throwable, context, hash);
} }
private int getOccurrences(List<String> lines) { private int getOccurrences(List<String> lines) {
@ -196,10 +193,10 @@ public class ErrorLogger implements ErrorHandler {
); );
} }
private void logNew(Path errorLog, Throwable throwable, ErrorContext context) { private void logNew(Path errorLog, Throwable throwable, ErrorContext context, String hash) {
List<String> stacktrace = buildReadableStacktrace(throwable); List<String> stacktrace = buildReadableStacktrace(throwable);
List<String> lines = Lists.builder(String.class) List<String> lines = Lists.builder(String.class)
.add("Last occurred: " + getTimeStamp() + " Occurrences: 1") .add(hash + " - Last occurred: " + getTimeStamp() + " Occurrences: 1")
.apply(builder -> this.buildContext(context, 1, builder)) .apply(builder -> this.buildContext(context, 1, builder))
.add("---- Stacktrace ----") .add("---- Stacktrace ----")
.addAll(stacktrace) .addAll(stacktrace)
@ -245,9 +242,12 @@ public class ErrorLogger implements ErrorHandler {
private List<String> buildReadableStacktrace(Throwable e) { private List<String> buildReadableStacktrace(Throwable e) {
List<String> trace = new ArrayList<>(); List<String> trace = new ArrayList<>();
trace.add(e.toString()); trace.add(e.toString());
Deduplicator deduplicator = new Deduplicator();
for (StackTraceElement element : e.getStackTrace()) { for (StackTraceElement element : e.getStackTrace()) {
trace.add(" " + element); String line = element.toString();
deduplicator.getLine(line).ifPresent(trace::add);
} }
deduplicator.getLeftoverDuplicateCountLine().ifPresent(trace::add);
Throwable[] suppressed = e.getSuppressed(); Throwable[] suppressed = e.getSuppressed();
if (suppressed.length > 0) { if (suppressed.length > 0) {
for (Throwable suppressedThrowable : suppressed) { for (Throwable suppressedThrowable : suppressed) {
@ -262,4 +262,32 @@ public class ErrorLogger implements ErrorHandler {
} }
return trace; return trace;
} }
private static class Deduplicator {
private final Set<String> lines = new HashSet<>();
private String lastDuplicate = null;
private int duplicateCount = 0;
public Optional<String> getLine(String line) {
if (duplicateCount > 0 && !line.equals(lastDuplicate)) {
String returnLine = " x " + duplicateCount;
duplicateCount = 0;
return Optional.of(returnLine);
} else if (line.equals(lastDuplicate)) {
duplicateCount++;
return Optional.empty();
} else if (lines.contains(line)) {
lastDuplicate = line;
duplicateCount = 1;
return Optional.empty();
} else {
lines.add(line);
return Optional.of(" " + line);
}
}
public Optional<String> getLeftoverDuplicateCountLine() {
return duplicateCount > 0 ? Optional.of(" x " + duplicateCount) : Optional.empty();
}
}
} }