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
|
2024-04-25 23:21:18 +02:00
|
|
|
index 012dbc51b70e24d01e03df5471196249cd534bb8..c0cde2b74865070c6901cbc5809e8f79d14969b2 100644
|
2021-08-12 19:55:20 +02:00
|
|
|
--- a/build.gradle.kts
|
|
|
|
|
+++ b/build.gradle.kts
|
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
|
2022-06-07 23:45:11 +02:00
|
|
|
implementation("commons-lang:commons-lang:2.6")
|
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")
|
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")
|
2021-08-12 19:55:20 +02:00
|
|
|
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
|
2024-04-23 21:23:27 +02:00
|
|
|
index ab1caec640128aa90f246e4bbecf5ca275e7982e..18e961a37b2830da6e5dab7aa35116b2f5215898 100644
|
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>
|
