diff options
Diffstat (limited to 'patches/unapplied/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch')
| -rw-r--r-- | patches/unapplied/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/patches/unapplied/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch new file mode 100644 index 0000000000..2273bec36a --- /dev/null +++ b/patches/unapplied/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -0,0 +1,71 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Minecrell <[email protected]> +Date: Thu, 21 Sep 2017 16:14:55 +0200 +Subject: [PATCH] Handle plugin prefixes using Log4J configuration + +Display logger name in the console for all loggers except the +root logger, Bukkit's logger ("Minecraft") and Minecraft loggers. +Since plugins now use the plugin name as logger name this will +restore the plugin prefixes without having to prepend them manually +to the log messages. + +Logger prefixes are shown by default for all loggers except for +the root logger, the Minecraft/Mojang loggers and the Bukkit loggers. +This may cause additional prefixes to be disabled for plugins bypassing +the plugin logger. + +diff --git a/build.gradle.kts b/build.gradle.kts +index 99e44684a3f6340ed3c0f73c690a9d4d51872f0d..0edae14596ffef85e894925fd5eb826641d8b9f1 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -36,7 +36,7 @@ dependencies { + all its classes to check if they are plugins. + Scanning takes about 1-2 seconds so adding this speeds up the server start. + */ +- runtimeOnly("org.apache.logging.log4j:log4j-core:2.19.0") ++ implementation("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - implementation + log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins + runtimeOnly(log4jPlugins.output) + alsoShade(log4jPlugins.output) +diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java +index e42677a14ec8e1a42747603fb4112822e326fb70..744edd40128c910c3ad2f3657bde995612e0a1e4 100644 +--- a/src/main/java/org/spigotmc/SpigotConfig.java ++++ b/src/main/java/org/spigotmc/SpigotConfig.java +@@ -284,7 +284,7 @@ public class SpigotConfig + private static void playerSample() + { + SpigotConfig.playerSample = SpigotConfig.getInt( "settings.sample-count", 12 ); +- System.out.println( "Server Ping Player Sample Count: " + SpigotConfig.playerSample ); ++ Bukkit.getLogger().log( Level.INFO, "Server Ping Player Sample Count: {0}", playerSample ); // Paper - Use logger + } + + public static int playerShuffle; +diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml +index 301874c1fe16c52ffa6228d79e6617d746e9a035..e073707a46397f62bedf1d413f9e5764e77dda6a 100644 +--- a/src/main/resources/log4j2.xml ++++ b/src/main/resources/log4j2.xml +@@ -5,10 +5,22 @@ + <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg{nolookups}%n" /> + </Queue> + <TerminalConsole name="TerminalConsole"> +- <PatternLayout pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx}" /> ++ <PatternLayout> ++ <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %msg%n%xEx}"> ++ <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix --> ++ <PatternMatch key=",net.minecraft.,Minecraft,com.mojang." ++ pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx}" /> ++ </LoggerNamePatternSelector> ++ </PatternLayout> + </TerminalConsole> + <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz"> +- <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n" /> ++ <PatternLayout> ++ <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %stripAnsi{%msg}%n"> ++ <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix --> ++ <PatternMatch key=",net.minecraft.,Minecraft,com.mojang." ++ pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n" /> ++ </LoggerNamePatternSelector> ++ </PatternLayout> + <Policies> + <TimeBasedTriggeringPolicy /> + <OnStartupTriggeringPolicy /> |