mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-17 00:55:10 +02:00
ea0b63992c
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: 4727d326 Don't let Sign extend SignSide, mark API as experimental 9b29bdcc PR-845: Add preliminary support for multi sided signs CraftBukkit Changes: b346a5f6d PR-1170: Add preliminary support for multi sided signs 86c816189 Update SQLite version d9324b4bc Fix addition of custom smithing trim / transform recipes Spigot Changes: 7d7b241e Rebuild patches
45 lines
1.8 KiB
Diff
45 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 8af9299c67ad2a1746bb340287b3373b208568ee..03095720795b994d0d97e7f65d350552792d71a8 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -27,6 +27,7 @@ dependencies {
|
|
implementation("commons-lang:commons-lang:2.6")
|
|
runtimeOnly("org.xerial:sqlite-jdbc:3.41.2.2")
|
|
runtimeOnly("com.mysql:mysql-connector-j:8.0.32")
|
|
+ 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>
|