From d337a8321181811a8901b9a4c63c78474acb6db6 Mon Sep 17 00:00:00 2001 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 2990c04b8..beda5dc8a 100644 --- a/pom.xml +++ b/pom.xml @@ -74,6 +74,13 @@ <artifactId>log4j-iostreams</artifactId> <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 000000000..db652a1f7 --- /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; + } +} diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties index 0694b2146..30efeb5fa 100644 --- a/src/main/resources/log4j2.component.properties +++ b/src/main/resources/log4j2.component.properties @@ -1 +1,3 @@ +Log4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector +log4j2.AsyncQueueFullPolicy="com.destroystokyo.paper.log.LogFullPolicy" log4j.skipJansi=true -- 2.22.0