diff options
| author | Josh Roy <[email protected]> | 2022-06-12 21:37:53 -0400 |
|---|---|---|
| committer | Josh Roy <[email protected]> | 2022-06-12 22:01:46 -0400 |
| commit | c6e6beef6ad12e7190144bd07f66365034fe3bf4 (patch) | |
| tree | e9b07059937789962ed6fba5b495c67aa6394638 | |
| parent | 38c13b27c946c1b468512f599e258fd4a5df0f4c (diff) | |
| download | Paper-c6e6beef6ad12e7190144bd07f66365034fe3bf4.tar.gz Paper-c6e6beef6ad12e7190144bd07f66365034fe3bf4.zip | |
Ensure that Log4J is shutdown when stopping the server (Fixes #7932)
| -rw-r--r-- | patches/server/0388-Improved-Watchdog-Support.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/patches/server/0388-Improved-Watchdog-Support.patch b/patches/server/0388-Improved-Watchdog-Support.patch index b7514bfb13..0263cd8d76 100644 --- a/patches/server/0388-Improved-Watchdog-Support.patch +++ b/patches/server/0388-Improved-Watchdog-Support.patch @@ -323,7 +323,7 @@ index f994d393929ca6813d4209fb9c93550e4f692228..0b049b267a1e1d6b48c035ed54ff2433 final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ()); net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a67fc9b0899f9d2128ac202ba0c12776653dfe28..59d0ada796efc4b2cf65d8398911f132320482ee 100644 +index 21a10a0dc98cb2c669a505d6185c2093855afae6..9e2adc414d43f0c91f222be5f082e74d9db173aa 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2067,7 +2067,7 @@ public final class CraftServer implements Server { @@ -451,10 +451,10 @@ index 69b7a11d423b1cd8560cd726dd2b9a2b203e7dfd..7a5e7e8a680ead5128fbf5829bc47704 private static List<String> asList(String... params) { return Arrays.asList(params); diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java -index b4a19d80bbf71591f25729fd0e98590350cb31d0..d752720f2f234b9dbd2117333fee1bfad663ec02 100644 +index b4a19d80bbf71591f25729fd0e98590350cb31d0..e948ec5a573b22645664eb53bc3e9932246544e4 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java -@@ -12,12 +12,27 @@ public class ServerShutdownThread extends Thread { +@@ -12,12 +12,28 @@ public class ServerShutdownThread extends Thread { @Override public void run() { try { @@ -477,6 +477,7 @@ index b4a19d80bbf71591f25729fd0e98590350cb31d0..d752720f2f234b9dbd2117333fee1bfa + e.printStackTrace(); + // Paper end } finally { ++ org.apache.logging.log4j.LogManager.shutdown(); // Paper try { - net.minecrell.terminalconsole.TerminalConsoleAppender.close(); // Paper - Use TerminalConsoleAppender + //net.minecrell.terminalconsole.TerminalConsoleAppender.close(); // Paper - Move into stop |