mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-03 05:26:50 +01:00
18c3716c49
This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
51 lines
2.1 KiB
Diff
51 lines
2.1 KiB
Diff
From 8ea6c7c92ee771c81f1b19594919eda513a1c96e Mon Sep 17 00:00:00 2001
|
|
From: Minecrell <minecrell@minecrell.net>
|
|
Date: Mon, 18 Sep 2017 12:00:03 +0200
|
|
Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
|
|
|
|
Log4j2 provides an optimized implementation of PrintStream that
|
|
redirects its output to a logger. Use it instead of a custom
|
|
implementation for minor performance improvements and some fixes.
|
|
|
|
With the old implementation, each call to System.print()
|
|
results in a separate line, even though it should not result in
|
|
a line break. Log4j's implementation handles it correctly.
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 26775156b..adf79de70 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -97,6 +97,13 @@
|
|
<scope>runtime</scope>
|
|
</dependency>
|
|
|
|
+ <!-- Paper - Add additional Log4J dependencies -->
|
|
+ <dependency>
|
|
+ <groupId>org.apache.logging.log4j</groupId>
|
|
+ <artifactId>log4j-iostreams</artifactId>
|
|
+ <version>2.8.1</version>
|
|
+ </dependency>
|
|
+
|
|
<!-- testing -->
|
|
<dependency>
|
|
<groupId>junit</groupId>
|
|
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
index b3f1aa999..854455711 100644
|
|
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
@@ -129,8 +129,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
|
*/
|
|
// Paper end
|
|
|
|
- System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
|
|
- System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
|
|
+ // Paper start - Use Log4j IOStreams
|
|
+ System.setOut(org.apache.logging.log4j.io.IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream());
|
|
+ System.setErr(org.apache.logging.log4j.io.IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream());
|
|
+ // Paper end
|
|
// CraftBukkit end
|
|
|
|
thread.setDaemon(true);
|
|
--
|
|
2.18.0
|
|
|