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

From 22a6f746e26c3ff51eadae48bb0b660189a3a0ba 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 a10ab7cbb6..2cb84223e6 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/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.21.0
Update upstream & fix some chunk related issues (#2177) * 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33 2019-06-14 04:27:40 +02:00			`From 22a6f746e26c3ff51eadae48bb0b660189a3a0ba Mon Sep 17 00:00:00 2001`
Use asynchronous Log4j 2 loggers 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`
Updated Upstream (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 CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason 2019-06-06 17:36:57 +02:00			`index a10ab7cbb6..2cb84223e6 100644`
Use asynchronous Log4j 2 loggers 2018-07-17 16:44:32 +02:00			`--- a/pom.xml`
			`+++ b/pom.xml`
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 79f6ba25 Skip tests on default builds b85cc32f Further discourage World.regenerateChunk CraftBukkit Changes: 7560d3b5 Skip tests on default builds d0a9130d SPIGOT-4563: Fix regenerating chunks saved to disk already Spigot Changes: 8173d06f Remove need for redundant second clone of repositories 8ede0393 Rebuild patches 2019-01-04 20:19:36 +01:00			`@@ -74,6 +74,13 @@`
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 20:11:49 +02:00			`<artifactId>log4j-iostreams</artifactId>`
Use asynchronous Log4j 2 loggers 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>`
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 20:11:49 +02:00			`<groupId>org.ow2.asm</groupId>`
			`<artifactId>asm</artifactId>`
Use asynchronous Log4j 2 loggers 2018-07-17 16:44:32 +02:00			`diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties`
			`new file mode 100644`
Updated Upstream (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 CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason 2019-06-06 17:36:57 +02:00			`index 0000000000..ee7c90784c`
Use asynchronous Log4j 2 loggers 2018-07-17 16:44:32 +02: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/Spigot) 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 Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes: d3ed1516 Fix dangerously threaded beacons 217a293d Don't relocate joptsimple to allow --help to work. 1be05a21 Prepare for imminent Java 12 release a49270b2 Mappings Update 5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches 2019-03-20 02:46:00 +01:00			`2.21.0`
Use asynchronous Log4j 2 loggers 2018-07-17 16:44:32 +02:00