JeremyStarTM/Engine
1
0
Fork 0
forked from StarOpenSource/Engine
Code Pull requests Activity Actions

Update stack trace placeholder

Browse source
This commit is contained in:
JeremyStar™ 2024-07-21 17:37:42 +02:00
parent 705f8a0623
commit 5cb8350a41
Signed by: JeremyStarTM
GPG key ID: E366BAEF67E4704D
2 changed files with 47 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/src/main/java/de/staropensource/sosengine/base/Engine.java
View file

@ -226,7 +226,7 @@ public final class Engine implements SubsystemMainClass {
CrashHandler.getCrashContent().put("Engine", crashContentEngine); CrashHandler.getCrashContent().put("Engine", crashContentEngine);
CrashHandler.getCrashContent().put("Java Virtual Machine", crashContentJvm); CrashHandler.getCrashContent().put("Java Virtual Machine", crashContentJvm);
CrashHandler.getCrashContent().put("Operating system", crashContentOS); CrashHandler.getCrashContent().put("Operating system", crashContentOS);
CrashHandler.getCrashContent().put("Stacktrace", "%stacktrace%"); CrashHandler.getCrashContent().put("Stacktrace", "\n%stacktrace%");
} }
/** /**

52
base/src/main/java/de/staropensource/sosengine/base/internal/placeholders/crashhandler/Stacktrace.java
View file

@ -20,10 +20,13 @@
package de.staropensource.sosengine.base.internal.placeholders.crashhandler; package de.staropensource.sosengine.base.internal.placeholders.crashhandler;
import de.staropensource.sosengine.base.classes.Placeholder; import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.exceptions.UnexpectedThrowableException;
import de.staropensource.sosengine.base.utility.parser.StackTraceParser; import de.staropensource.sosengine.base.utility.parser.StackTraceParser;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.lang.reflect.InvocationTargetException;
/** /**
* Implements the {@code stacktrace} placeholder. * Implements the {@code stacktrace} placeholder.
* *
@ -54,13 +57,50 @@ public final class Stacktrace implements Placeholder {
@NotNull @NotNull
@Override @Override
public String replace(@NotNull String text) { public String replace(@NotNull String text) {
String replacement = "No stacktrace is available."; return text.replace("%stacktrace%", throwable == null ? "No stack trace is available." : getFullStackTrace(throwable));
if (throwable != null) {
StackTraceParser stackTraceParser = new StackTraceParser(throwable);
replacement = stackTraceParser.getHeader() + "\n" + stackTraceParser.getStackTrace();
} }
return text.replace("%stacktrace%", replacement); /**
* Returns the full stack trace.
*
* @param throwable throwable get the full stack trace of
* @return full stack trace
* @since v1-alpha2
*/
@NotNull
private static String getFullStackTrace(@NotNull Throwable throwable) {
return getFullStackTrace(throwable, new StringBuilder());
}
/**
* Returns the full stack trace.
*
* @param throwable throwable to operate on
* @param stacktrace stacktrace to append and return
* @return full stack trace
* @since v1-alpha2
*/
@NotNull
private static String getFullStackTrace(@NotNull Throwable throwable, @NotNull StringBuilder stacktrace) {
// Add newline
if (!stacktrace.isEmpty())
stacktrace.append("\n");
// Append stack trace
StackTraceParser parser = new StackTraceParser(throwable);
stacktrace
.append(parser.getHeader())
.append("\n")
.append(parser.getStackTrace());
// Handle throwables which contain other throwables
if (throwable instanceof UnexpectedThrowableException unexpectedThrowableException)
getFullStackTrace(unexpectedThrowableException.getThrowable(), stacktrace);
if (throwable instanceof InvocationTargetException invocationTargetException)
getFullStackTrace(invocationTargetException.getTargetException(), stacktrace);
return stacktrace.toString(); // Return stack trace
} }
} }