启动发生错误时刷新log4j输出到控制台

myktw · Oct 3, 2020 · eb3ed0a · eb3ed0a
1 parent 2a54a03
commit eb3ed0a
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/src/main/java/catserver/server/CatGradleStart.java b/src/main/java/catserver/server/CatGradleStart.java
@@ -39,7 +39,12 @@ protected void launch(String[] args) throws Throwable
         extras = null;
 
         System.gc();
-        Class.forName("net.minecraft.launchwrapper.Launch").getDeclaredMethod("main", String[].class).invoke(null, new Object[] { args });
+        try {
+            Class.forName("net.minecraft.launchwrapper.Launch").getDeclaredMethod("main", String[].class).invoke(null, new Object[] { args });
+        } catch (Throwable throwable) {
+            throwable.printStackTrace();
+            catserver.server.utils.Log4jUitls.flush(); // CatServer - flush error to console
+        }
     }
 
     private String[] getArgs()

diff --git a/src/main/java/catserver/server/utils/Log4jUitls.java b/src/main/java/catserver/server/utils/Log4jUitls.java
@@ -0,0 +1,34 @@
+package catserver.server.utils;
+
+import com.mojang.util.QueueLogAppender;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.locks.ReadWriteLock;
+
+public class Log4jUitls {
+    public static void flush() {
+        try {
+            Field filed_QUEUES = QueueLogAppender.class.getDeclaredField("QUEUES");
+            filed_QUEUES.setAccessible(true);
+
+            Field filed_QUEUE_LOCK = QueueLogAppender.class.getDeclaredField("QUEUE_LOCK");
+            filed_QUEUE_LOCK.setAccessible(true);
+
+            Map<String, BlockingQueue<String>> QUEUES = (Map<String, BlockingQueue<String>>) filed_QUEUES.get(null);
+            ReadWriteLock QUEUE_LOCK = (ReadWriteLock) filed_QUEUE_LOCK.get(null);
+
+            QUEUE_LOCK.readLock().lock();
+            final BlockingQueue<String> queue = QUEUES.get("TerminalConsole");
+            if (queue != null) {
+                String message;
+                while ((message = queue.poll()) != null) {
+                    System.out.write(message.getBytes());
+                    System.out.flush();
+                }
+            }
+            QUEUE_LOCK.readLock().unlock();
+        } catch (Exception ignored) { }
+    }
+}
diff --git a/src/main/java/net/minecraftforge/fml/common/launcher/FMLServerTweaker.java b/src/main/java/net/minecraftforge/fml/common/launcher/FMLServerTweaker.java
@@ -58,6 +58,7 @@ public void injectIntoClassLoader(LaunchClassLoader classLoader)
         classLoader.addClassLoaderExclusion("jline.");
         classLoader.addClassLoaderExclusion("org.fusesource.");
         classLoader.addClassLoaderExclusion("net.minecraftforge.server.console.log4j.TerminalConsoleAppender");
+        classLoader.addClassLoaderExclusion("catserver.server.utils.log4j.Log4jUitls");
 
         FMLLaunchHandler.configureForServerLaunch(classLoader, this);
         FMLLaunchHandler.appendCoreMods();

diff --git a/src/main/java/net/minecraftforge/fml/relauncher/ServerLaunchWrapper.java b/src/main/java/net/minecraftforge/fml/relauncher/ServerLaunchWrapper.java
@@ -63,8 +63,9 @@ private void run(String[] args)
         }
         catch (Exception e)
         {
-            System.err.printf("A problem occurred running the Server launcher.");
+            System.err.println("A problem occurred running the Server launcher.");
             e.printStackTrace(System.err);
+            catserver.server.utils.Log4jUitls.flush(); // CatServer - flush error to console
             System.exit(1);
         }
     }