Paper-Old/patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Thu, 12 Aug 2021 04:46:41 -0700
Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread


diff --git a/build.gradle.kts b/build.gradle.kts
index 7002a2ccb519ede29244924062f7ed2f49546f7d..7cb7a4024f53c50d88652cb6c497d815ed67c148 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -38,6 +38,7 @@ dependencies {
     implementation("commons-lang:commons-lang:2.6")
     runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0")
     runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
+    runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
 
     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")
     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 88957220d5574e5590e8a545605d76c0c7b0a10e..ea4e2161c0bd43884055cc6b8d70b2139f70e720 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -29,15 +29,18 @@
             </Policies>
             <DefaultRolloverStrategy max="1000"/>
         </RollingRandomAccessFile>
+        <Async name="Async">
+            <AppenderRef ref="File"/>
+            <AppenderRef ref="TerminalConsole" level="info"/>
+            <AppenderRef ref="ServerGuiConsole" level="info"/>
+        </Async>
     </Appenders>
     <Loggers>
         <Root level="info">
             <filters>
                 <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
             </filters>
-            <AppenderRef ref="File"/>
-            <AppenderRef ref="TerminalConsole" level="info"/>
-            <AppenderRef ref="ServerGuiConsole" level="info"/>
+            <AppenderRef ref="Async"/>
         </Root>
     </Loggers>
 </Configuration>
Use AsyncAppender instead of AsyncLoggerContextSelector to keep loggging IO off main thread (#6381) 2021-08-12 19:55:20 +02:00			`From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
			`From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>`
			`Date: Thu, 12 Aug 2021 04:46:41 -0700`
			`Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread`


			`diff --git a/build.gradle.kts b/build.gradle.kts`
some work 2023-09-22 00:01:00 +02:00			`index 7002a2ccb519ede29244924062f7ed2f49546f7d..7cb7a4024f53c50d88652cb6c497d815ed67c148 100644`
Use AsyncAppender instead of AsyncLoggerContextSelector to keep loggging IO off main thread (#6381) 2021-08-12 19:55:20 +02:00			`--- a/build.gradle.kts`
			`+++ b/build.gradle.kts`
Move Log4j plugins to own source set (#9428) 2023-07-02 07:00:46 +02:00			`@@ -38,6 +38,7 @@ dependencies {`
More more more more more patches 2022-06-07 23:45:11 +02:00			`implementation("commons-lang:commons-lang:2.6")`
some work 2023-09-22 00:01:00 +02:00			`runtimeOnly("org.xerial:sqlite-jdbc:3.43.0.0")`
			`runtimeOnly("com.mysql:mysql-connector-j:8.1.0")`
Use AsyncAppender instead of AsyncLoggerContextSelector to keep loggging IO off main thread (#6381) 2021-08-12 19:55:20 +02:00			`+ runtimeOnly("com.lmax:disruptor:3.4.4") // Paper`

Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 0c5d8709 SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends 255c4fdb SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot CraftBukkit Changes: b6b514b7e SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends fcff84de9 SPIGOT-7399: Revert null check in CraftMetaItem#safelyAdd 44a4b5649 SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot 676969d01 SPIGOT-7389: Handle setting null items in ChiseledBookshelf Inventory 2023-06-18 13:03:18 +02:00			`runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5")`
			`runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")`
Use AsyncAppender instead of AsyncLoggerContextSelector to keep loggging IO off main thread (#6381) 2021-08-12 19:55:20 +02:00			`diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml`
Use net.kyori.ansi for console logging (#9313) Uses the new ANSIComponentSerializer introduced in Adventure 4.14.0 to serialize components when logging them via the ComponentLogger, or when sending messages to the console. This replaces the old solution which uses legacy jank and custom color conversions, with a new library that handles the conversion and config 2023-06-13 00:00:12 +02:00			`index 88957220d5574e5590e8a545605d76c0c7b0a10e..ea4e2161c0bd43884055cc6b8d70b2139f70e720 100644`
Use AsyncAppender instead of AsyncLoggerContextSelector to keep loggging IO off main thread (#6381) 2021-08-12 19:55:20 +02:00			`--- a/src/main/resources/log4j2.xml`
			`+++ b/src/main/resources/log4j2.xml`
			`@@ -29,15 +29,18 @@`
			`</Policies>`
			`<DefaultRolloverStrategy max="1000"/>`
			`</RollingRandomAccessFile>`
			`+ <Async name="Async">`
			`+ <AppenderRef ref="File"/>`
			`+ <AppenderRef ref="TerminalConsole" level="info"/>`
			`+ <AppenderRef ref="ServerGuiConsole" level="info"/>`
			`+ </Async>`
			`</Appenders>`
			`<Loggers>`
			`<Root level="info">`
			`<filters>`
			`<MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />`
			`</filters>`
			`- <AppenderRef ref="File"/>`
			`- <AppenderRef ref="TerminalConsole" level="info"/>`
			`- <AppenderRef ref="ServerGuiConsole" level="info"/>`
			`+ <AppenderRef ref="Async"/>`
			`</Root>`
			`</Loggers>`
			`</Configuration>`