mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
aabbfcdf8d
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: 4b08dbc5 PR-752: Make Leaves Waterlogged de323fc9 Downgrade dependency version CraftBukkit Changes: c3f219edb Fix missing abstract in CraftLeaves 886e6d8c8 SPIGOT-7038: Setting title or subtitle to empty string causes the player to disconnect 6c302a5e3 Make Leaves Waterlogged 53b681be5 Downgrade dependency version Spigot Changes: ee737122 Fixed system messages shown in action bar f343df82 SPIGOT-7036: Don't use CHAT message type 63a06049 SPIGOT-7035: Actionbar Sending in Main Chat
44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
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 0bff41bce07cb0fed23346704538a0577f2bc88b..87789b8b857ae4e89a158fb356fb5bb1a4ae93b1 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -25,6 +25,7 @@ dependencies {
|
|
implementation("commons-lang:commons-lang:2.6")
|
|
runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
|
|
runtimeOnly("mysql:mysql-connector-java:8.0.29")
|
|
+ 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 476f4a5cbe664ddd05474cb88553018bd334a5b8..3dc317e466e1b93dff030794dd7f29ca1b266778 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>
|