mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-03 10:30:32 +02:00
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
247 lines
7.8 KiB
Diff
247 lines
7.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: SirYwell <hannesgreule@outlook.de>
|
|
Date: Sat, 10 Jul 2021 11:12:30 +0200
|
|
Subject: [PATCH] Rewrite LogEvents to contain the source jars in stack traces
|
|
|
|
|
|
diff --git a/src/log4jPlugins/java/io/papermc/paper/logging/DelegateLogEvent.java b/src/log4jPlugins/java/io/papermc/paper/logging/DelegateLogEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..6ffd1befe64c6c3036c22e05ed1c44808d64bd28
|
|
--- /dev/null
|
|
+++ b/src/log4jPlugins/java/io/papermc/paper/logging/DelegateLogEvent.java
|
|
@@ -0,0 +1,130 @@
|
|
+package io.papermc.paper.logging;
|
|
+
|
|
+import org.apache.logging.log4j.Level;
|
|
+import org.apache.logging.log4j.Marker;
|
|
+import org.apache.logging.log4j.ThreadContext;
|
|
+import org.apache.logging.log4j.core.LogEvent;
|
|
+import org.apache.logging.log4j.core.impl.ThrowableProxy;
|
|
+import org.apache.logging.log4j.core.time.Instant;
|
|
+import org.apache.logging.log4j.message.Message;
|
|
+import org.apache.logging.log4j.util.ReadOnlyStringMap;
|
|
+
|
|
+import java.util.Map;
|
|
+
|
|
+public class DelegateLogEvent implements LogEvent {
|
|
+ private final LogEvent original;
|
|
+
|
|
+ protected DelegateLogEvent(LogEvent original) {
|
|
+ this.original = original;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public LogEvent toImmutable() {
|
|
+ return this.original.toImmutable();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Map<String, String> getContextMap() {
|
|
+ return this.original.getContextMap();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public ReadOnlyStringMap getContextData() {
|
|
+ return this.original.getContextData();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public ThreadContext.ContextStack getContextStack() {
|
|
+ return this.original.getContextStack();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public String getLoggerFqcn() {
|
|
+ return this.original.getLoggerFqcn();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Level getLevel() {
|
|
+ return this.original.getLevel();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public String getLoggerName() {
|
|
+ return this.original.getLoggerName();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Marker getMarker() {
|
|
+ return this.original.getMarker();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Message getMessage() {
|
|
+ return this.original.getMessage();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public long getTimeMillis() {
|
|
+ return this.original.getTimeMillis();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Instant getInstant() {
|
|
+ return this.original.getInstant();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public StackTraceElement getSource() {
|
|
+ return this.original.getSource();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public String getThreadName() {
|
|
+ return this.original.getThreadName();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public long getThreadId() {
|
|
+ return this.original.getThreadId();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int getThreadPriority() {
|
|
+ return this.original.getThreadPriority();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Throwable getThrown() {
|
|
+ return this.original.getThrown();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public ThrowableProxy getThrownProxy() {
|
|
+ return this.original.getThrownProxy();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isEndOfBatch() {
|
|
+ return this.original.isEndOfBatch();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isIncludeLocation() {
|
|
+ return this.original.isIncludeLocation();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setEndOfBatch(boolean endOfBatch) {
|
|
+ this.original.setEndOfBatch(endOfBatch);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setIncludeLocation(boolean locationRequired) {
|
|
+ this.original.setIncludeLocation(locationRequired);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public long getNanoTime() {
|
|
+ return this.original.getNanoTime();
|
|
+ }
|
|
+}
|
|
diff --git a/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoLogEvent.java b/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoLogEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..558427c65b4051923f73d15d85ee519be005060a
|
|
--- /dev/null
|
|
+++ b/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoLogEvent.java
|
|
@@ -0,0 +1,48 @@
|
|
+package io.papermc.paper.logging;
|
|
+
|
|
+import org.apache.logging.log4j.core.LogEvent;
|
|
+import org.apache.logging.log4j.core.impl.ExtendedClassInfo;
|
|
+import org.apache.logging.log4j.core.impl.ExtendedStackTraceElement;
|
|
+import org.apache.logging.log4j.core.impl.ThrowableProxy;
|
|
+
|
|
+public class ExtraClassInfoLogEvent extends DelegateLogEvent {
|
|
+
|
|
+ private boolean fixed;
|
|
+
|
|
+ public ExtraClassInfoLogEvent(LogEvent original) {
|
|
+ super(original);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public ThrowableProxy getThrownProxy() {
|
|
+ if (fixed) {
|
|
+ return super.getThrownProxy();
|
|
+ }
|
|
+ rewriteStackTrace(super.getThrownProxy());
|
|
+ fixed = true;
|
|
+ return super.getThrownProxy();
|
|
+ }
|
|
+
|
|
+ private void rewriteStackTrace(ThrowableProxy throwable) {
|
|
+ ExtendedStackTraceElement[] stackTrace = throwable.getExtendedStackTrace();
|
|
+ for (int i = 0; i < stackTrace.length; i++) {
|
|
+ ExtendedClassInfo classInfo = stackTrace[i].getExtraClassInfo();
|
|
+ if (classInfo.getLocation().equals("?")) {
|
|
+ StackTraceElement element = stackTrace[i].getStackTraceElement();
|
|
+ String classLoaderName = element.getClassLoaderName();
|
|
+ if (classLoaderName != null) {
|
|
+ stackTrace[i] = new ExtendedStackTraceElement(element,
|
|
+ new ExtendedClassInfo(classInfo.getExact(), classLoaderName, "?"));
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ if (throwable.getCauseProxy() != null) {
|
|
+ rewriteStackTrace(throwable.getCauseProxy());
|
|
+ }
|
|
+ if (throwable.getSuppressedProxies() != null) {
|
|
+ for (ThrowableProxy proxy : throwable.getSuppressedProxies()) {
|
|
+ rewriteStackTrace(proxy);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+}
|
|
diff --git a/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoRewritePolicy.java b/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoRewritePolicy.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..34734bb969a1a74c7a4f9c17d40ebf007ad5d701
|
|
--- /dev/null
|
|
+++ b/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoRewritePolicy.java
|
|
@@ -0,0 +1,29 @@
|
|
+package io.papermc.paper.logging;
|
|
+
|
|
+import org.apache.logging.log4j.core.Core;
|
|
+import org.apache.logging.log4j.core.LogEvent;
|
|
+import org.apache.logging.log4j.core.appender.rewrite.RewritePolicy;
|
|
+import org.apache.logging.log4j.core.config.plugins.Plugin;
|
|
+import org.apache.logging.log4j.core.config.plugins.PluginFactory;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+@Plugin(
|
|
+ name = "ExtraClassInfoRewritePolicy",
|
|
+ category = Core.CATEGORY_NAME,
|
|
+ elementType = "rewritePolicy",
|
|
+ printObject = true
|
|
+)
|
|
+public final class ExtraClassInfoRewritePolicy implements RewritePolicy {
|
|
+ @Override
|
|
+ public LogEvent rewrite(LogEvent source) {
|
|
+ if (source.getThrown() != null) {
|
|
+ return new ExtraClassInfoLogEvent(source);
|
|
+ }
|
|
+ return source;
|
|
+ }
|
|
+
|
|
+ @PluginFactory
|
|
+ public static @NotNull ExtraClassInfoRewritePolicy createPolicy() {
|
|
+ return new ExtraClassInfoRewritePolicy();
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
|
|
index 2b247d55e39246fbef31279b14c45fc40f956bfb..675cd61221e807aadf28322b46c3daa1370241b5 100644
|
|
--- a/src/main/resources/log4j2.xml
|
|
+++ b/src/main/resources/log4j2.xml
|
|
@@ -34,6 +34,10 @@
|
|
</Async>
|
|
<Rewrite name="rewrite">
|
|
<StacktraceDeobfuscatingRewritePolicy />
|
|
+ <AppenderRef ref="rewrite2"/>
|
|
+ </Rewrite>
|
|
+ <Rewrite name="rewrite2">
|
|
+ <ExtraClassInfoRewritePolicy />
|
|
<AppenderRef ref="File"/>
|
|
<AppenderRef ref="TerminalConsole" level="info"/>
|
|
<AppenderRef ref="ServerGuiConsole" level="info"/>
|