mirror of
https://github.com/PaperMC/Waterfall.git
synced 2025-01-03 22:47:38 +01:00
337ca7f887
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 70038c91 Revert "#2714: Remove unnecessary throws in ServerConnector" 39ef20b2 #2716: Don't attempt to send kick packet during handshake phase 74a6aa32 #2714: Remove unnecessary throws in ServerConnector c7984070 Misc dependency update
50 lines
2.5 KiB
Diff
50 lines
2.5 KiB
Diff
From 2205994921a10600becdb405c2e06a1f8ec0c18b Mon Sep 17 00:00:00 2001
|
|
From: Minecrell <minecrell@minecrell.net>
|
|
Date: Fri, 22 Sep 2017 13:07:31 +0200
|
|
Subject: [PATCH] Handle plugin prefixes using Log4J
|
|
|
|
|
|
diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java b/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java
|
|
index bc91208a..e85b4914 100644
|
|
--- a/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java
|
|
+++ b/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java
|
|
@@ -85,7 +85,7 @@ public class Plugin
|
|
this.proxy = proxy;
|
|
this.description = description;
|
|
this.file = description.getFile();
|
|
- this.logger = new PluginLogger( this );
|
|
+ this.logger = Logger.getLogger(description.getName()); // Waterfall - Handle plugin prefixes in implementation
|
|
}
|
|
|
|
//
|
|
diff --git a/log4j/src/main/resources/log4j2.xml b/log4j/src/main/resources/log4j2.xml
|
|
index 93ce3b14..3b3525f0 100644
|
|
--- a/log4j/src/main/resources/log4j2.xml
|
|
+++ b/log4j/src/main/resources/log4j2.xml
|
|
@@ -2,10 +2,20 @@
|
|
<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 and BungeeCord loggers without prefix -->
|
|
+ <PatternMatch key=",BungeeCord" 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" immediateFlush="false">
|
|
- <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 and BungeeCord loggers without prefix -->
|
|
+ <PatternMatch key=",BungeeCord" pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n" />
|
|
+ </LoggerNamePatternSelector>
|
|
+ </PatternLayout>
|
|
<Policies>
|
|
<TimeBasedTriggeringPolicy />
|
|
<OnStartupTriggeringPolicy />
|
|
--
|
|
2.24.0
|
|
|