Fix logging busy waiting!

Author: Enovale

Alibi/Advertiser.cs

@@ -21,12 +21,14 @@ private async Task SendHeartbeat(string url)
         {
             Server.Logger.Log(LogSeverity.Info, $"[Advertiser] Attempting to send heartbeat...", true);
             var server = Server.Instance;
-            var json = new Heartbeat(
-                server.ServerConfiguration.Port,
-                server.ServerConfiguration.WebsocketPort,
-                server.ConnectedPlayers,
-                server.ServerConfiguration.ServerName,
-                server.ServerConfiguration.ServerDescription);
+            var json = new
+            {
+                port = server.ServerConfiguration.Port,
+                ws_port = server.ServerConfiguration.WebsocketPort,
+                players = server.ConnectedPlayers,
+                name = server.ServerConfiguration.ServerName,
+                description = server.ServerConfiguration.ServerDescription
+            };
             var response = await _client.PostAsync(url, new StringContent(JsonConvert.SerializeObject(json)));
             response.EnsureSuccessStatusCode();
         } 
@@ -60,7 +62,5 @@ public void Stop()
         {
             _cts.Cancel();
         }
-
-        private record Heartbeat(int port, int ws_port, int players, string name, string description);
     }
 }

Alibi/Logger.cs

@@ -2,15 +2,13 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Threading.Tasks;
 using Alibi.Plugins.API;
 
 namespace Alibi
 {
     public class Logger
     {
         public const string LogsFolder = "Logs";
-        private readonly Queue<Tuple<LogSeverity, string>> _consoleLogQueue = new();
         private readonly Queue<string> _logBuffer;
 
         private readonly Server _server;
@@ -19,29 +17,6 @@ public Logger(Server server)
         {
             _server = server;
             _logBuffer = new Queue<string>(_server.ServerConfiguration.LogBufferSize);
-            Task.Run(PrintLogs);
-        }
-
-        private void PrintLogs()
-        {
-            while (true)
-            {
-                Task.Delay(100).Wait();
-                if (!_consoleLogQueue.TryDequeue(out var log))
-                    continue;
-                
-                Console.ForegroundColor = log.Item1 switch
-                {
-                    LogSeverity.Info => ConsoleColor.White,
-                    LogSeverity.Special => ConsoleColor.Cyan,
-                    LogSeverity.Warning => ConsoleColor.Yellow,
-                    LogSeverity.Error => ConsoleColor.Red,
-                    _ => Console.ForegroundColor
-                };
-                Console.WriteLine(log.Item2);
-                Console.ResetColor();
-            }
-            // ReSharper disable once FunctionNeverReturns
         }
 
         /// <summary>
@@ -69,7 +44,16 @@ private void AddLog(LogSeverity severity, string log)
                 _logBuffer.Dequeue();
 
             _logBuffer.Enqueue(log);
-            _consoleLogQueue.Enqueue(new Tuple<LogSeverity, string>(severity, log));
+            Console.ForegroundColor = severity switch
+            {
+                LogSeverity.Info => ConsoleColor.White,
+                LogSeverity.Special => ConsoleColor.Cyan,
+                LogSeverity.Warning => ConsoleColor.Yellow,
+                LogSeverity.Error => ConsoleColor.Red,
+                _ => Console.ForegroundColor
+            };
+            Console.WriteLine(log);
+            Console.ResetColor();
         }
 
         public void IcMessageLog(string message, IArea area, IClient client)

Alibi/Program.cs

@@ -2,22 +2,18 @@
 using System;
 using System.Globalization;
 using System.IO;
-using System.Threading;
 using System.Threading.Tasks;
 using Alibi.Plugins.API;
 
 namespace Alibi
 {
     internal static class Program
     {
-        internal static readonly ManualResetEvent ResetEvent;
-
         private static readonly Server _server;
 
         static Program()
         {
             CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
-            ResetEvent = new ManualResetEvent(false);
             Environment.CurrentDirectory = GetRealProcessDirectory();
             if (!File.Exists(Server.ConfigPath) || new FileInfo(Server.ConfigPath).Length <= 0)
                 new Configuration().SaveToFile(Server.ConfigPath);
@@ -26,14 +22,14 @@ static Program()
             _server.Start();
         }
 
-        private static void Main(string[] args)
+        private static async Task Main(string[] args)
         {
             AppDomain.CurrentDomain.ProcessExit += ExitProgram;
             Console.CancelKeyPress += ExitProgram;
             AppDomain.CurrentDomain.UnhandledException += ExitProgram;
             TaskScheduler.UnobservedTaskException += ExitProgram;
 
-            ResetEvent.WaitOne();
+            await Task.Delay(-1);
         }
 
         private static string GetRealProcessDirectory()

Alibi/Server.cs

@@ -79,7 +79,7 @@ public Server(Configuration config) : base(config.BoundIpAddress, config.Port)
             {
                 Logger.Log(LogSeverity.Warning,
                     " At least one area is required to start the server, writing default area...");
-                readAreas = new[] {new Area()};
+                readAreas = [new Area()];
                 File.WriteAllText(AreasPath, JsonConvert.SerializeObject(readAreas, Formatting.Indented));
             }
 
@@ -117,7 +117,7 @@ public void InitializeLists()
         {
             EnsureConfigFiles();
             MusicList = File.ReadAllLines(MusicPath);
-            if (MusicList[0].Contains("."))
+            if (MusicList[0].Contains('.'))
             {
                 var tmp = MusicList.ToList();
                 tmp.Insert(0, "==Music==");
@@ -379,7 +379,6 @@ protected override void OnStopped()
             _advertiser.Stop();
             _wsProxy.Stop();
             Logger.Dump();
-            Program.ResetEvent.Set();
             Dispose();
         }
     }