testserver/Spigot-Server-Patches/0292-Use-asynchronous-Log4j...

From 8b890db5ab561306a00fdf5e89c609de4d69e800 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 b28f8e0929..6d8b27e927 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,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/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
new file mode 100644
index 0000000000..ee7c90784c
--- /dev/null
+++ b/src/main/resources/log4j2.component.properties
@@ -0,0 +1 @@
+Log4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
-- 
2.19.0
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears 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: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes: 1cf8b5dc SPIGOT-4400: Populators running on existing chunks 116cb9a1 SPIGOT-4399: Add attribute modifier equality test 5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag 2018-09-28 23:31:59 +00:00			`From 8b890db5ab561306a00fdf5e89c609de4d69e800 Mon Sep 17 00:00:00 2001`
Use asynchronous Log4j 2 loggers 2018-07-17 14:44:32 +00: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`
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears 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: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes: 1cf8b5dc SPIGOT-4400: Populators running on existing chunks 116cb9a1 SPIGOT-4399: Add attribute modifier equality test 5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag 2018-09-28 23:31:59 +00:00			`index b28f8e0929..6d8b27e927 100644`
Use asynchronous Log4j 2 loggers 2018-07-17 14:44:32 +00:00			`--- a/pom.xml`
			`+++ b/pom.xml`
Paper 1.13.1 Update Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes: d0bb0a1d Fix some tests randomly failing 997d378d Fix client stall in specific teleportation scenarios b3dc2366 SPIGOT-4307: Fix hacky API for banners on shields 2a271162 SPIGOT-4301: Fix more invalid enchants 5d0d83bb SPIGOT-4309: Add "forced" display of particles a6772578 Add additional tests for CraftBlockData ce1af0c3 Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1 2018-08-26 18:11:49 +00:00			`@@ -73,6 +73,13 @@`
			`<artifactId>log4j-iostreams</artifactId>`
Use asynchronous Log4j 2 loggers 2018-07-17 14:44:32 +00: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>`
Paper 1.13.1 Update Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes: d0bb0a1d Fix some tests randomly failing 997d378d Fix client stall in specific teleportation scenarios b3dc2366 SPIGOT-4307: Fix hacky API for banners on shields 2a271162 SPIGOT-4301: Fix more invalid enchants 5d0d83bb SPIGOT-4309: Add "forced" display of particles a6772578 Add additional tests for CraftBlockData ce1af0c3 Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1 2018-08-26 18:11:49 +00:00			`<groupId>org.ow2.asm</groupId>`
			`<artifactId>asm</artifactId>`
Use asynchronous Log4j 2 loggers 2018-07-17 14:44:32 +00:00			`diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties`
			`new file mode 100644`
Update B/CB/S 2018-07-23 08:39:55 +00:00			`index 0000000000..ee7c90784c`
Use asynchronous Log4j 2 loggers 2018-07-17 14:44:32 +00:00			`--- /dev/null`
			`+++ b/src/main/resources/log4j2.component.properties`
			`@@ -0,0 +1 @@`
			`+Log4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector`
			`--`
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears 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: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes: 1cf8b5dc SPIGOT-4400: Populators running on existing chunks 116cb9a1 SPIGOT-4399: Add attribute modifier equality test 5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag 2018-09-28 23:31:59 +00:00			`2.19.0`
Use asynchronous Log4j 2 loggers 2018-07-17 14:44:32 +00:00