warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Fix ConsoleInput for Linux users with try/catch. (#1803)

Browse source
This commit is contained in:
Daniel Dias Rodrigues 2024-05-30 18:03:28 -03:00 • committed by GitHub
parent 84c68bf73c
commit e85c56ec2d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 31 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Projects/Server/Console/ConsoleInputHandler.cs
View file

@ -18,6 +18,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Threading;
using Server.Logging;
namespace Server;
@ -147,37 +148,46 @@ public static class ConsoleInputHandler
}
}
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();
if (Volatile.Read(ref _expectUserInput))
try
{
_input = input;
_receivedUserInput.Set();
_endUserInput.WaitOne();
continue;
}
var input = Console.ReadLine()?.Trim();
if (string.IsNullOrEmpty(input))
if (Volatile.Read(ref _expectUserInput))
{
_input = input;
_receivedUserInput.Set();
_endUserInput.WaitOne();
continue;
}
if (string.IsNullOrEmpty(input))
{
continue;
}
var splitInput = input.Split(' ', 2);
var command = splitInput[0].ToLower();
Action<string> action;
lock (_inputCommands)
{
action = _inputCommands.GetValueOrDefault(command)?.Function;
}
action?.Invoke(splitInput.Length > 1 ? splitInput[1] : string.Empty);
}
catch (Exception e)
{
continue;
logger.Warning(e, "Failed to process console input");
}
var splitInput = input.Split(' ', 2);
var command = splitInput[0].ToLower();
Action<string> action;
lock (_inputCommands)
{
action = _inputCommands.GetValueOrDefault(command)?.Function;
}
action?.Invoke(splitInput.Length > 1 ? splitInput[1] : string.Empty);
}
}