From a8476f48529b567e1195dbc90c7b68f95e87efdb Mon Sep 17 00:00:00 2001 From: Minecrell 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/pom.xml b/pom.xml index f4fbd5c016..4585ee5bea 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core 2.8.1 - runtime + compile org.apache.logging.log4j diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java index fdca34346a..6d77bbc5aa 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -286,7 +286,7 @@ public class SpigotConfig private static void playerSample() { playerSample = getInt( "settings.sample-count", 12 ); - System.out.println( "Server Ping Player Sample Count: " + 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 620b9490e5..a8bdaaeaa1 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -5,10 +5,22 @@ - + + + + + + - + + + + + + -- 2.26.2