mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-03 01:10:37 +01:00
ce30be9781
Change email address for some older patches to make it clear that they are MIT licensed too.
75 lines
3.6 KiB
Diff
75 lines
3.6 KiB
Diff
From e5dc209cabc90dbdc9824472d8888176fb1f9234 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 7734d84e8..28976dae8 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -94,7 +94,7 @@
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
<artifactId>log4j-core</artifactId>
|
|
<version>2.8.1</version>
|
|
- <scope>runtime</scope>
|
|
+ <scope>compile</scope>
|
|
</dependency>
|
|
|
|
<!-- Paper - Add additional Log4J dependencies -->
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index 9ce3e1365..cc1f3ac96 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -282,7 +282,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 08b6bb7f9..9f8334376 100644
|
|
--- a/src/main/resources/log4j2.xml
|
|
+++ b/src/main/resources/log4j2.xml
|
|
@@ -2,10 +2,22 @@
|
|
<Configuration status="WARN">
|
|
<Appenders>
|
|
<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 />
|
|
--
|
|
2.16.1
|
|
|