From 71151d879780b6635f6e6a27a1f08350b282fc86 Mon Sep 17 00:00:00 2001
From: IzzelAliz <csh2001331@126.com>
Date: Thu, 26 Aug 2021 14:52:23 +0800
Subject: [PATCH] Simplify log pattern

---
 .../src/main/resources/arclight-log4j2.xml    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/arclight-forge/src/main/resources/arclight-log4j2.xml b/arclight-forge/src/main/resources/arclight-log4j2.xml
index 0bae1483..48a7c056 100644
--- a/arclight-forge/src/main/resources/arclight-log4j2.xml
+++ b/arclight-forge/src/main/resources/arclight-log4j2.xml
@@ -23,14 +23,14 @@
             <PatternLayout>
                 <!-- use white for info output -->
                 <LoggerNamePatternSelector
-                        defaultPattern="%highlight{[%d{HH:mm:ss}] [%t/%level] [%c{1.}/%markerSimpleName]: %minecraftFormatting{%msg}%n%tEx}{INFO=normal}">
+                        defaultPattern="%highlight{[%d{HH:mm:ss} %level] [%c{1.}%notEmpty{/%markerSimpleName}]: %minecraftFormatting{%msg}%n%tEx}{INFO=normal}">
                     <!-- don't include the full logger name for Mojang's logs since they use full class names and it's very verbose -->
                     <PatternMatch key="net.minecraft."
-                                  pattern="%highlight{[%d{HH:mm:ss}] [%t/%level] [minecraft/%logger{1}]: %minecraftFormatting{%msg}%n%tEx}{INFO=normal}"/>
+                                  pattern="%highlight{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%tEx}{INFO=normal}"/>
                     <PatternMatch key="com.mojang."
-                                  pattern="%highlight{[%d{HH:mm:ss}] [%t/%level] [mojang/%logger{1}]: %minecraftFormatting{%msg}%n%tEx}{INFO=normal}"/>
+                                  pattern="%highlight{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%tEx}{INFO=normal}"/>
                     <PatternMatch key="net.minecraftforge."
-                                  pattern="%highlight{[%d{HH:mm:ss}] [%t/%level] [forge/%logger{1}]: %minecraftFormatting{%msg}%n%tEx}{INFO=normal}"/>
+                                  pattern="%highlight{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%tEx}{INFO=normal}"/>
                 </LoggerNamePatternSelector>
             </PatternLayout>
         </TerminalConsole>
@@ -59,6 +59,12 @@
             </Policies>
             <DefaultRolloverStrategy max="5" fileIndex="min"/>
         </RollingRandomAccessFile>
+        <Async name="Async">
+            <AppenderRef ref="Console" level="${sys:forge.logging.console.level:-info}"/>
+            <AppenderRef ref="ServerGuiConsole" level="${sys:forge.logging.console.level:-info}"/>
+            <AppenderRef ref="File" level="${sys:forge.logging.file.level:-info}"/>
+            <AppenderRef ref="DebugFile" level="${sys:forge.logging.debugFile.level:-debug}"/>
+        </Async>
     </Appenders>
     <Loggers>
         <!-- make sure mojang's logging is set to 'info' so that their LOGGER.isDebugEnabled() behavior isn't active -->
@@ -66,10 +72,7 @@
         <Logger level="${sys:forge.logging.mojang.level:-info}" name="net.minecraft"/>
         <Logger level="${sys:forge.logging.classtransformer.level:-info}" name="cpw.mods.modlauncher.ClassTransformer"/>
         <Root level="all">
-            <AppenderRef ref="Console" level="${sys:forge.logging.console.level:-info}"/>
-            <AppenderRef ref="ServerGuiConsole" level="${sys:forge.logging.console.level:-info}"/>
-            <AppenderRef ref="File" level="${sys:forge.logging.file.level:-info}"/>
-            <AppenderRef ref="DebugFile" level="${sys:forge.logging.debugFile.level:-debug}"/>
+            <AppenderRef ref="Async"/>
         </Root>
     </Loggers>
 </Configuration>