From 2abca14a053e6a49f41653e9b28b1ee645827ab3 Mon Sep 17 00:00:00 2001 From: cpw Date: Sun, 22 Nov 2015 15:31:06 -0500 Subject: [PATCH] Small tweak to the OUT/ERR logger - should skip the Throwable stuffs now. --- .../fml/common/TracingPrintStream.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/common/TracingPrintStream.java b/src/main/java/net/minecraftforge/fml/common/TracingPrintStream.java index 2187c9d3ee..80aef6c261 100644 --- a/src/main/java/net/minecraftforge/fml/common/TracingPrintStream.java +++ b/src/main/java/net/minecraftforge/fml/common/TracingPrintStream.java @@ -15,34 +15,36 @@ import org.apache.logging.log4j.Logger; /** * PrintStream which redirects it's output to a given logger. - * + * * @author Arkan */ public class TracingPrintStream extends PrintStream { - + private Logger logger; private int BASE_DEPTH = 3; - + public TracingPrintStream(Logger logger, PrintStream original) { super(original); this.logger = logger; } - + @Override public void println(Object o) { logger.info(getPrefix() + o); } - + @Override public void println(String s) { logger.info(getPrefix() + s); } - + private String getPrefix() { StackTraceElement[] elems = Thread.currentThread().getStackTrace(); StackTraceElement elem = elems[BASE_DEPTH]; // The caller is always at BASE_DEPTH, including this call. if (elem.getClassName().startsWith("kotlin.io.")) { elem = elems[BASE_DEPTH + 2]; // Kotlins IoPackage masks origins 2 deeper in the stack. + } else if (elem.getClassName().startsWith("java.lang.Throwable")) { + elem = elems[BASE_DEPTH + 1]; } return "[" + elem.getClassName() + ":" + elem.getMethodName() + ":" + elem.getLineNumber() + "]: "; }