Logging async / locking / flushing tweaks

MonkeyModdingTroop · Oct 2, 2024 · 4844d5b · 4844d5b
1 parent a9115cb
commit 4844d5b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/MonkeyLoader/Logging/ConsoleLoggingHandler.cs b/MonkeyLoader/Logging/ConsoleLoggingHandler.cs
@@ -114,6 +114,7 @@ public static async Task<bool> ConnectAsync(CancellationToken cancellationToken)
                     _consoleHostProcess = process;
                     _pipeClient = pipeClient;
                     _writer = new(_pipeClient);
+                    _writer.AutoFlush = true;
 
                     return true;
                 }
@@ -202,8 +203,8 @@ public void Log(string message, string textHighlight = NORMAL)
             if (!Connected)
                 return;
 
-            _writer.WriteLine($"{NORMAL + GRAY}[{DateTime.UtcNow:HH:mm:ss:ffff}]{textHighlight} {message}{NORMAL + GRAY}");
-            _writer.Flush();
+            lock (_writer)
+                _writer.WriteLine($"{NORMAL + GRAY}[{DateTime.UtcNow:HH:mm:ss:ffff}]{textHighlight} {message}{NORMAL + GRAY}");
         }
 
         /// <inheritdoc/>

diff --git a/MonkeyLoader/Logging/LoggingController.cs b/MonkeyLoader/Logging/LoggingController.cs
@@ -122,35 +122,44 @@ internal void LogInternal(LoggingLevel level, string identifier, Func<object> me
             if (!ShouldLog(level))
                 return;
 
-            LogLevelToLogger(level)(MakeMessageProducer(level, identifier, messageProducer));
+            Task.Run(() =>
+            {
+                LogLevelToLogger(level)(MakeMessageProducer(level, identifier, messageProducer));
 
-            HandleAutoFlush(level);
+                HandleAutoFlush(level);
+            });
         }
 
         internal void LogInternal(LoggingLevel level, string identifier, IEnumerable<Func<object>> messageProducers)
         {
             if (!ShouldLog(level))
                 return;
 
-            var logger = LogLevelToLogger(level);
+            Task.Run(() =>
+            {
+                var logger = LogLevelToLogger(level);
 
-            foreach (var messageProducer in messageProducers)
-                logger(MakeMessageProducer(level, identifier, messageProducer));
+                foreach (var messageProducer in messageProducers)
+                    logger(MakeMessageProducer(level, identifier, messageProducer));
 
-            HandleAutoFlush(level);
+                HandleAutoFlush(level);
+            });
         }
 
         internal void LogInternal(LoggingLevel level, string identifier, IEnumerable<object> messages)
         {
             if (!ShouldLog(level))
                 return;
 
-            var logger = LogLevelToLogger(level);
+            Task.Run(() =>
+            {
+                var logger = LogLevelToLogger(level);
 
-            foreach (var message in messages)
-                logger(MakeMessageProducer(level, identifier, message));
+                foreach (var message in messages)
+                    logger(MakeMessageProducer(level, identifier, message));
 
-            HandleAutoFlush(level);
+                HandleAutoFlush(level);
+            });
         }
 
         private static string LogLevelToString(LoggingLevel level) => level switch