From d775003bb2cc46e4f392dd156225f0f938ffee06 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Wed, 22 Jan 2020 09:10:36 +1100
Subject: [PATCH] Fix log messages being split across GUI and terminal

By: md_5 <git@md-5.net>
---
 .../bukkit/craftbukkit/util/TerminalConsoleWriterThread.java  | 2 +-
 paper-server/src/main/resources/log4j2.xml                    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/paper-server/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
index 12c9273e01..99564fed7c 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
@@ -28,7 +28,7 @@ public class TerminalConsoleWriterThread extends Thread {
 
         // Using name from log4j config in vanilla jar
         while (true) {
-            message = QueueLogAppender.getNextLogEvent("ServerGuiConsole");
+            message = QueueLogAppender.getNextLogEvent("TerminalConsole");
             if (message == null) {
                 continue;
             }
diff --git a/paper-server/src/main/resources/log4j2.xml b/paper-server/src/main/resources/log4j2.xml
index 3893c88495..40be2a9680 100644
--- a/paper-server/src/main/resources/log4j2.xml
+++ b/paper-server/src/main/resources/log4j2.xml
@@ -7,6 +7,9 @@
         <Queue name="ServerGuiConsole">
             <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />
         </Queue>
+        <Queue name="TerminalConsole">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
+        </Queue>
         <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
             <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
             <Policies>
@@ -24,6 +27,7 @@
             <AppenderRef ref="SysOut"/>
             <AppenderRef ref="File"/>
             <AppenderRef ref="ServerGuiConsole"/>
+            <AppenderRef ref="TerminalConsole"/>
         </Root>
     </Loggers>
 </Configuration>