Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-17 03:50:08 +01:00
6f2009754d
At the time this was re-added, there was concern around how the JIT would handle the system property that enabled it. This shouldn't be a problem, and as such we no longer need to block access to it. The Vanilla Method Profiler will not provide much to most users however there is no harm in providing it as an option. For most users, the recommended and supported method for determining performance issues with Paper will continue to be Timings.
52 Zeilen
2.1 KiB
Diff
52 Zeilen
2.1 KiB
Diff
From e527a04082247252ccc8d5cf4a106d211c2746e7 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 da69bb93..7734d84e 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 b3f1aa99..85445571 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.14.3
|
|
|