Paper/Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch

59 lines
2.0 KiB
Diff
Raw Normal View History

From 2afc85c134cab7ce729e32a67bebcf7896462deb Mon Sep 17 00:00:00 2001
2018-07-17 16:44:32 +02:00
From: Minecrell <minecrell@minecrell.net>
Date: Tue, 17 Jul 2018 16:42:17 +0200
Subject: [PATCH] Use asynchronous Log4j 2 loggers
diff --git a/pom.xml b/pom.xml
index 6f2fe9c26d..55679af926 100644
2018-07-17 16:44:32 +02:00
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,13 @@
<artifactId>log4j-iostreams</artifactId>
2018-07-17 16:44:32 +02:00
<version>2.8.1</version>
</dependency>
+ <!-- Paper - Async loggers -->
+ <dependency>
+ <groupId>com.lmax</groupId>
+ <artifactId>disruptor</artifactId>
+ <version>3.4.2</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
diff --git a/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java b/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java
new file mode 100644
index 0000000000..db652a1f7a
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java
@@ -0,0 +1,17 @@
+package com.destroystokyo.paper.log;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.async.AsyncQueueFullPolicy;
+import org.apache.logging.log4j.core.async.EventRoute;
+
+public final class LogFullPolicy implements AsyncQueueFullPolicy {
+
+ /*
+ * Prevents log calls being logged out of order when the log queue is full.
+ */
+
+ @Override
+ public EventRoute getRoute(final long backgroundThreadId, final Level level) {
+ return EventRoute.ENQUEUE;
+ }
+}
2018-07-17 16:44:32 +02:00
diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
index 0694b21465..30efeb5faf 100644
--- a/src/main/resources/log4j2.component.properties
2018-07-17 16:44:32 +02:00
+++ b/src/main/resources/log4j2.component.properties
@@ -1 +1,3 @@
2018-07-17 16:44:32 +02:00
+Log4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
+log4j2.AsyncQueueFullPolicy="com.destroystokyo.paper.log.LogFullPolicy"
log4j.skipJansi=true
2018-07-17 16:44:32 +02:00
--
2.25.1
2018-07-17 16:44:32 +02:00