41647af74c
We cannot put blocking network I/O onto the worldgen threads, this will crash the server if it stalls
72 Zeilen
4.0 KiB
Diff
72 Zeilen
4.0 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/build.gradle.kts b/build.gradle.kts
|
|
index d4141a24cb5ba20e8c53c85206b32120ff18eb48..a57fad0a75fe18f70d3dd6cd5c6a2ab90eb0498d 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -17,7 +17,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.14.1")
|
|
+ implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation
|
|
// Paper end
|
|
implementation("org.apache.logging.log4j:log4j-iostreams:2.17.1") // Paper
|
|
implementation("org.ow2.asm:asm:9.3")
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index 051d7c7fc5796ad056ae1ba5e5e630fde8794108..c2e3d32e51902503af88f089e366e784f42d999a 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()
|
|
{
|
|
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 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 />
|