Ensure log messages are written in order

MonkeyModdingTroop · Nov 22, 2024 · 4ab3717 · 4ab3717
1 parent 66b6b2b
commit 4ab3717
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/MonkeyLoader/Logging/LoggingController.cs b/MonkeyLoader/Logging/LoggingController.cs
@@ -18,8 +18,8 @@ public sealed class LoggingController
 
         private readonly Timer _flushTimer;
         private bool _autoFlush = true;
-
         private LoggingHandler _handler = MissingLoggingHandler.Instance;
+        private Task _lastLogTask = Task.CompletedTask;
 
         /// <summary>
         /// Gets or sets whether this logger will automatically trigger <see cref="Flush()">flushing</see> of messages.
@@ -122,7 +122,7 @@ internal void LogInternal(LoggingLevel level, string identifier, Func<object> me
             if (!ShouldLog(level))
                 return;
 
-            Task.Run(() =>
+            QueueLogging(() =>
             {
                 LogLevelToLogger(level)(MakeMessageProducer(level, identifier, messageProducer));
 
@@ -135,7 +135,7 @@ internal void LogInternal(LoggingLevel level, string identifier, IEnumerable<Fun
             if (!ShouldLog(level))
                 return;
 
-            Task.Run(() =>
+            QueueLogging(() =>
             {
                 var logger = LogLevelToLogger(level);
 
@@ -151,7 +151,7 @@ internal void LogInternal(LoggingLevel level, string identifier, IEnumerable<obj
             if (!ShouldLog(level))
                 return;
 
-            Task.Run(() =>
+            QueueLogging(() =>
             {
                 var logger = LogLevelToLogger(level);
 
@@ -236,6 +236,15 @@ private Func<object> MakeMessageProducer(LoggingLevel level, string identifier,
         private Func<object> MakeMessageProducer(LoggingLevel level, string identifier, object message)
             => () => $"{LogLevelToString(level)} [{identifier}] {message}";
 
+        private void QueueLogging(Action handleLogging)
+        {
+            lock (this)
+            {
+                _lastLogTask = _lastLogTask.ContinueWith(_ => handleLogging(),
+                    TaskContinuationOptions.RunContinuationsAsynchronously);
+            }
+        }
+
         private sealed class DeferredMessage
         {
             public readonly LoggingLevel LoggingLevel;