mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-04 22:14:40 +01:00
72 lines
3.8 KiB
Diff
72 lines
3.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Minecrell <minecrell@minecrell.net>
|
||
|
|
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 3841fe3630c090f8a468333d43caeb2b5841329d..f5429f2f1979542fd93956d2f436d20d0e3a66b8 100644
|
||
|
|
--- a/pom.xml
|
||
|
|
+++ b/pom.xml
|
||
|
|
@@ -76,7 +76,7 @@
|
||
|
|
<dependency>
|
||
|
|
<groupId>org.apache.logging.log4j</groupId>
|
||
|
|
<artifactId>log4j-core</artifactId>
|
||
|
|
- <scope>runtime</scope>
|
||
|
|
+ <scope>compile</scope>
|
||
|
|
</dependency>
|
||
|
|
<dependency>
|
||
|
|
<groupId>org.apache.logging.log4j</groupId>
|
||
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
||
|
|
index 3c93a497a790b8d800852db2ac48feca41f45cef..e8e5e5b568ba53dd006f1461cb4f027ceeae5528 100644
|
||
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
||
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
||
|
|
@@ -290,7 +290,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 620b9490e5f159080e50289d127404a1b56adbef..a8bdaaeaa1a9316848416f0533739b9b083ca151 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%n" />
|
||
|
|
</Queue>
|
||
|
|
<TerminalConsole name="TerminalConsole">
|
||
|
|
- <PatternLayout pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}" />
|
||
|
|
+ <PatternLayout>
|
||
|
|
+ <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %minecraftFormatting{%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]: %minecraftFormatting{%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]: %minecraftFormatting{%msg}{strip}%n" />
|
||
|
|
+ <PatternLayout>
|
||
|
|
+ <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %minecraftFormatting{%msg}{strip}%n">
|
||
|
|
+ <!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
|
||
|
|
+ <PatternMatch key=",net.minecraft.,Minecraft,com.mojang."
|
||
|
|
+ pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n" />
|
||
|
|
+ </LoggerNamePatternSelector>
|
||
|
|
+ </PatternLayout>
|
||
|
|
<Policies>
|
||
|
|
<TimeBasedTriggeringPolicy />
|
||
|
|
<OnStartupTriggeringPolicy />
|