diff options
| author | Jake Potrebic <[email protected]> | 2023-02-15 13:27:40 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-02-15 13:27:40 -0800 |
| commit | afe633df085f1c78802170bca6d03a6873fc0344 (patch) | |
| tree | 367330b21a1978676e13790c00d7e2c3f4010a08 /patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch | |
| parent | f2f9e8cc4dde8b2e754d193d553b99fa824515b1 (diff) | |
| download | Paper-afe633df085f1c78802170bca6d03a6873fc0344.tar.gz Paper-afe633df085f1c78802170bca6d03a6873fc0344.zip | |
convert API/server tests to mockito (#8848)
* convert API tests to mockito
* convert server tests to mockito
* add co-author
Diffstat (limited to 'patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch')
| -rw-r--r-- | patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch deleted file mode 100644 index 5afb9562c0..0000000000 --- a/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Minecrell <[email protected]> -Date: Sat, 23 Sep 2017 21:07:20 +0200 -Subject: [PATCH] Improve Log4J Configuration / Plugin Loggers - -Add full exceptions to log4j to not truncate stack traces - -Disable logger prefix for various plugins bypassing the plugin logger - -Some plugins bypass the plugin logger and add the plugin prefix -manually to the log message. Since they use other logger names -(e.g. qualified class names) these would now also appear in the -log. Disable the logger prefix for these plugins so the messages -show up correctly. - -diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index a8bdaaeaa1a9316848416f0533739b9b083ca151..476f4a5cbe664ddd05474cb88553018bd334a5b8 100644 ---- a/src/main/resources/log4j2.xml -+++ b/src/main/resources/log4j2.xml -@@ -6,19 +6,21 @@ - </Queue> - <TerminalConsole name="TerminalConsole"> - <PatternLayout> -- <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %minecraftFormatting{%msg}%n%xEx}"> -+ <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %minecraftFormatting{%msg}%n%xEx{full}}"> - <!-- 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}" /> -+ <!-- Disable prefix for various plugins that bypass the plugin logger --> -+ <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE" -+ pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx{full}}" /> - </LoggerNamePatternSelector> - </PatternLayout> - </TerminalConsole> - <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz"> - <PatternLayout> -- <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %minecraftFormatting{%msg}{strip}%n"> -+ <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %minecraftFormatting{%msg}{strip}%n%xEx{full}"> - <!-- 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" /> -+ <!-- Disable prefix for various plugins that bypass the plugin logger --> -+ <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE" -+ pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n%xEx{full}" /> - </LoggerNamePatternSelector> - </PatternLayout> - <Policies> |