add more patches back

2021-06-15 21:53:50 -07:00 · 2021-06-15 21:53:50 -07:00 · 6f064f928e
commit 6f064f928e
parent ea0ec8c5a0
544 changed files with 148 additions and 126 deletions
--- a/patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch
+++ b/patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch
@ -0,0 +1,67 @@
+From 0000000000000000000000000000000000000000 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/build.gradle.kts b/build.gradle.kts
+index 755d0472684579272a63a481d7504ff2dae69c2d..39ae4cc76438c40e007bfe5e8ace7cbaee66d3b8 100644
+--- a/build.gradle.kts
+++ b/build.gradle.kts
+@@ -42,6 +42,7 @@ dependencies {
+     }
+     runtimeOnly("org.xerial:sqlite-jdbc:3.34.0")
+     runtimeOnly("mysql:mysql-connector-java:8.0.23") // Paper
+    runtimeOnly("com.lmax:disruptor:3.4.2") // Paper
+ 
+     runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.1")
+     runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
+diff --git a/pom.xml b/pom.xml
+index f5e74f74e32095c4ad1f8094a0dd64be8e193f0c..86cce7143abd317326cc755118bf61435e82e479 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -57,6 +57,13 @@
+                 </exclusion>
+             </exclusions>
+         </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 0000000000000000000000000000000000000000..db652a1f7abc80bc751fd94925abaec58ab1a563
+--- /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 0694b21465fb9e4164e71862ff24b62241b191f2..30efeb5faf8e7faccf1b252fa0ed6a9fc31c40a7 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