Fix ConsoleInput for Linux users with try/catch.

modernuo · May 30, 2024 · 802d361 · 802d361
1 parent 84c68bf
commit 802d361
Showing 1 changed file with 28 additions and 20 deletions.
diff --git a/Projects/Server/Console/ConsoleInputHandler.cs b/Projects/Server/Console/ConsoleInputHandler.cs
@@ -18,6 +18,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
+using Server.Logging;
 
 namespace Server;
 
@@ -147,37 +148,44 @@ private static void DisplayHelp(string arguments)
         }
     }
 
+    private static readonly ILogger logger = LogFactory.GetLogger(typeof(ConsoleInputHandler));
+
     private static async void ProcessConsoleInput()
     {
         var token = Core.ClosingTokenSource.Token;
 
         while (!token.IsCancellationRequested)
         {
-            var input = Console.ReadLine()?.Trim();
+            try {
+                var input = Console.ReadLine()?.Trim();
 
-            if (Volatile.Read(ref _expectUserInput))
-            {
-                _input = input;
-                _receivedUserInput.Set();
-                _endUserInput.WaitOne();
-                continue;
-            }
+                if (Volatile.Read(ref _expectUserInput))
+                {
+                    _input = input;
+                    _receivedUserInput.Set();
+                    _endUserInput.WaitOne();
+                    continue;
+                }
 
-            if (string.IsNullOrEmpty(input))
-            {
-                continue;
-            }
+                if (string.IsNullOrEmpty(input))
+                {
+                    continue;
+                }
 
-            var splitInput = input.Split(' ', 2);
-            var command = splitInput[0].ToLower();
+                var splitInput = input.Split(' ', 2);
+                var command = splitInput[0].ToLower();
 
-            Action<string> action;
-            lock (_inputCommands)
-            {
-                action = _inputCommands.GetValueOrDefault(command)?.Function;
-            }
+                Action<string> action;
+                lock (_inputCommands)
+                {
+                    action = _inputCommands.GetValueOrDefault(command)?.Function;
+                }
 
-            action?.Invoke(splitInput.Length > 1 ? splitInput[1] : string.Empty);
+                action?.Invoke(splitInput.Length > 1 ? splitInput[1] : string.Empty);
+            }
+            catch {
+                logger.Warning("Failed to process console input");
+            }
         }
     }