Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-11 11:34:18 +01:00
Code Issues Projects Releases Wiki Activity
c0b3809024
Waterfall/BungeeCord-Patches/0038-Add-Log4j-configuration-that-replicates-the-old-Bung.patch

52 lines
2.2 KiB
Diff
Raw Normal View History

Updated Upstream (BungeeCord) (#695) 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: 6613aaea Add test fix for library classes being visible to non-dependent plugins 53ce6b93 #3200: Fix protocol for 21w40a d8e29384 #2466: Use switch in "BungeeCord" plugin message handling 5cf869df #3198: Remove terminally deprecated SecurityManager f26f7d88 Add optional 1.18 (21w40a) snapshot protocol support
2021-10-09 11:43:12 +02:00
From 3d6b47a2d059f408afdcd3e65c60ba6a127a2e4b Mon Sep 17 00:00:00 2001
Update to TerminalConsoleAppender 1.1.0 Fixes a long-standing race condition in TerminalConsoleAppender, that eventually resulted in IllegalStateExceptions or duplicate input prompts. Fixes #242, Fixes #188
2018-07-06 23:00:08 +02:00
From: Minecrell <minecrell@minecrell.net>
Add Log4j configuration that replicates the old BungeeCord setup Can be enabled using -Dlog4j.configurationFile=log4j2-bungee.xml
2017-09-24 12:07:49 +02:00
Date: Sun, 24 Sep 2017 12:06:49 +0200
Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord
setup
Can be enabled using -Dlog4j.configurationFile=log4j2-bungee.xml.
diff --git a/log4j/src/main/resources/log4j2-bungee.xml b/log4j/src/main/resources/log4j2-bungee.xml
new file mode 100644
Set up Log4j 2 async loggers using system property From the Log4j 2 documentation: When AsyncLoggerContextSelector is used to make all loggers asynchronous, make sure to use normal <root> and <logger> elements in the configuration. The AsyncLoggerContextSelector will ensure that all loggers are asynchronous, using a mechanism that is different from what happens when you configure <asyncRoot> or <asyncLogger>. The latter elements are intended for mixing async with sync loggers. https://logging.apache.org/log4j/2.x/manual/async.html Since we are not using mixed sync/async loggers, we should use the system property to enable the async loggers.
2018-07-18 16:43:25 +02:00
index 00000000..6e9c09c5
Add Log4j configuration that replicates the old BungeeCord setup Can be enabled using -Dlog4j.configurationFile=log4j2-bungee.xml
2017-09-24 12:07:49 +02:00
--- /dev/null
+++ b/log4j/src/main/resources/log4j2-bungee.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Log4j configuration that replicates the old BungeeCord logging setup -->
+<Configuration status="warn">
+ <Appenders>
+ <TerminalConsole name="TerminalConsole">
+ <PatternLayout>
Minor improvements to Log4j configuration that replicates Bungee setup - Remove colons that are not present in Bungee's log file - Use standard stack traces instead of Log4j's extended stack traces
2017-10-31 18:43:06 +01:00
+ <LoggerNamePatternSelector defaultPattern="%highlightError{%d{HH:mm:ss} [%level] [%logger] %minecraftFormatting{%msg}%n%ex}">
Add Log4j configuration that replicates the old BungeeCord setup Can be enabled using -Dlog4j.configurationFile=log4j2-bungee.xml
2017-09-24 12:07:49 +02:00
+ <!-- Log root and BungeeCord loggers without prefix -->
Minor improvements to Log4j configuration that replicates Bungee setup - Remove colons that are not present in Bungee's log file - Use standard stack traces instead of Log4j's extended stack traces
2017-10-31 18:43:06 +01:00
+ <PatternMatch key=",BungeeCord" pattern="%highlightError{%d{HH:mm:ss} [%level] %minecraftFormatting{%msg}%n%ex}" />
Add Log4j configuration that replicates the old BungeeCord setup Can be enabled using -Dlog4j.configurationFile=log4j2-bungee.xml
2017-09-24 12:07:49 +02:00
+ </LoggerNamePatternSelector>
+ </PatternLayout>
+ </TerminalConsole>
+ <RollingRandomAccessFile name="File" fileName="proxy.log.0" filePattern="proxy.log.%i" immediateFlush="false">
+ <PatternLayout>
Minor improvements to Log4j configuration that replicates Bungee setup - Remove colons that are not present in Bungee's log file - Use standard stack traces instead of Log4j's extended stack traces
2017-10-31 18:43:06 +01:00
+ <LoggerNamePatternSelector defaultPattern="%d{HH:mm:ss} [%level] [%logger] %minecraftFormatting{%msg}{strip}%n%ex">
Add Log4j configuration that replicates the old BungeeCord setup Can be enabled using -Dlog4j.configurationFile=log4j2-bungee.xml
2017-09-24 12:07:49 +02:00
+ <!-- Log root and BungeeCord loggers without prefix -->
Minor improvements to Log4j configuration that replicates Bungee setup - Remove colons that are not present in Bungee's log file - Use standard stack traces instead of Log4j's extended stack traces
2017-10-31 18:43:06 +01:00
+ <PatternMatch key=",BungeeCord" pattern="%d{HH:mm:ss} [%level] %minecraftFormatting{%msg}{strip}%n%ex" />
Add Log4j configuration that replicates the old BungeeCord setup Can be enabled using -Dlog4j.configurationFile=log4j2-bungee.xml
2017-09-24 12:07:49 +02:00
+ </LoggerNamePatternSelector>
+ </PatternLayout>
+ <Policies>
+ <OnStartupTriggeringPolicy />
+ <SizeBasedTriggeringPolicy size="8 MB" />
+ </Policies>
+ <DefaultRolloverStrategy fileIndex="min" max="8" />
+ </RollingRandomAccessFile>
+ </Appenders>
+
+ <Loggers>
Set up Log4j 2 async loggers using system property From the Log4j 2 documentation: When AsyncLoggerContextSelector is used to make all loggers asynchronous, make sure to use normal <root> and <logger> elements in the configuration. The AsyncLoggerContextSelector will ensure that all loggers are asynchronous, using a mechanism that is different from what happens when you configure <asyncRoot> or <asyncLogger>. The latter elements are intended for mixing async with sync loggers. https://logging.apache.org/log4j/2.x/manual/async.html Since we are not using mixed sync/async loggers, we should use the system property to enable the async loggers.
2018-07-18 16:43:25 +02:00
+ <Root level="info">
Add Log4j configuration that replicates the old BungeeCord setup Can be enabled using -Dlog4j.configurationFile=log4j2-bungee.xml
2017-09-24 12:07:49 +02:00
+ <AppenderRef ref="TerminalConsole" />
+ <AppenderRef ref="File" />
Set up Log4j 2 async loggers using system property From the Log4j 2 documentation: When AsyncLoggerContextSelector is used to make all loggers asynchronous, make sure to use normal <root> and <logger> elements in the configuration. The AsyncLoggerContextSelector will ensure that all loggers are asynchronous, using a mechanism that is different from what happens when you configure <asyncRoot> or <asyncLogger>. The latter elements are intended for mixing async with sync loggers. https://logging.apache.org/log4j/2.x/manual/async.html Since we are not using mixed sync/async loggers, we should use the system property to enable the async loggers.
2018-07-18 16:43:25 +02:00
+ </Root>
Add Log4j configuration that replicates the old BungeeCord setup Can be enabled using -Dlog4j.configurationFile=log4j2-bungee.xml
2017-09-24 12:07:49 +02:00
+ </Loggers>
+</Configuration>
--
Updated Upstream (BungeeCord) (#695) 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: 6613aaea Add test fix for library classes being visible to non-dependent plugins 53ce6b93 #3200: Fix protocol for 21w40a d8e29384 #2466: Use switch in "BungeeCord" plugin message handling 5cf869df #3198: Remove terminally deprecated SecurityManager f26f7d88 Add optional 1.18 (21w40a) snapshot protocol support
2021-10-09 11:43:12 +02:00
2.30.1 (Apple Git-130)
Add Log4j configuration that replicates the old BungeeCord setup Can be enabled using -Dlog4j.configurationFile=log4j2-bungee.xml
2017-09-24 12:07:49 +02:00
Reference in New Issue Copy Permalink