Paper-Old/patches/server/0014-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 012dbc51b70e24d01e03df5471196249cd534bb8..c0cde2b74865070c6901cbc5809e8f79d14969b2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -34,8 +34,7 @@ dependencies {
     implementation("org.ow2.asm:asm-commons:9.7")
     implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
     implementation("commons-lang:commons-lang:2.6")
-    runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")
-    runtimeOnly("com.mysql:mysql-connector-j:8.3.0")
+    runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
 
     runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index ab1caec640128aa90f246e4bbecf5ca275e7982e..18e961a37b2830da6e5dab7aa35116b2f5215898 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`
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: 69fa4695 Add some missing deprecation annotations f850da2e Update Maven plugins/versions 8d8400db Use regular compiler seeing as ECJ doesn't support Java 21 JRE c29e1688 Revert "BUILDTOOLS-676: Downgrade Maven compiler version" 07bce714 SPIGOT-7355: More field renames and fixes 6a8ea764 Fix bad merge in penultimate commit 50a7920c Fix imports in previous commit 83640dd1 PR-995: Add required feature to MinecraftExperimental for easy lookups fc1f96cf BUILDTOOLS-676: Downgrade Maven compiler version CraftBukkit Changes: 90f1059ba Fix item placement 661afb43c SPIGOT-7633: Clearer error message for missing particle data 807b465b3 SPIGOT-7634: Armadillo updates infrequently 590cf09a8 Fix unit tests always seeing Mojang server as unavailable 7c7ac5eb2 SPIGOT-7636: Fix clearing ItemMeta 4a72905cf SPIGOT-7635: Fix Player#transfer and cookie methods ebb50e136 Fix incorrect Vault implementation b33fed8b7 Update Maven plugins/versions 6f00f0608 SPIGOT-7632: Control middle clicking chest does not copy contents db821f405 Use regular compiler seeing as ECJ doesn't support Java 21 JRE 8a2976737 Revert "BUILDTOOLS-676: Downgrade Maven compiler version" 0297f87bb SPIGOT-7355: More field renames and fixes 2d03bdf6a SPIGOT-7629: Fix loading banner patterns e77951fac Fix equality of deserialized display names c66f3e4fd SPIGOT-7631: Fix deserialisation of BlockStateMeta 9c2c7be8d SPIGOT-7630: Fix crash saving unticked leashed entities 8c1e7c841 PR-1384: Disable certain PlayerProfile tests, if Mojang's services or internet are not available ced93d572 SPIGOT-7626: sendSignChange() has no effect c77362cae SPIGOT-7625: ItemStack with lore cannot be serialized in 1.20.5 ff2004387 SPIGOT-7620: Fix server crash when hoppers transfer items to double chests 8b4abeb03 BUILDTOOLS-676: Downgrade Maven compiler version 2024-04-25 23:21:18 +02:00			`index 012dbc51b70e24d01e03df5471196249cd534bb8..c0cde2b74865070c6901cbc5809e8f79d14969b2 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`
Work 2024-04-23 21:23:27 +02:00			`@@ -34,8 +34,7 @@ dependencies {`
			`implementation("org.ow2.asm:asm-commons:9.7")`
			`implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files`
More more more more more patches 2022-06-07 23:45:11 +02:00			`implementation("commons-lang:commons-lang:2.6")`
Work 2024-04-23 21:23:27 +02:00			`- runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")`
			`- runtimeOnly("com.mysql:mysql-connector-j:8.3.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) (#10034) 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: f29cb801 Separate checkstyle-suppressions file is not required 86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack 9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode() 994a6163 Attempt upgrade of resolver libraries CraftBukkit Changes: b3b43a6ad Add Checkstyle check for unused imports 13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names 3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API 2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor 1dbdbbed4 PR-1238: Remove unnecessary sign ticking 659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper e37e29ce0 Increase outdated build delay c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack 492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode() e11fbb9d7 Upgrade MySQL driver 9f3a0bd2a Attempt upgrade of resolver libraries 60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion Spigot Changes: 06d602e7 Rebuild patches 2023-12-17 03:09:28 +01:00			`runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")`
			`runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")`
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`
Work 2024-04-23 21:23:27 +02:00			`index ab1caec640128aa90f246e4bbecf5ca275e7982e..18e961a37b2830da6e5dab7aa35116b2f5215898 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>`