update console log file read with async logic

Author: jstricklin

Unity-MCP-Plugin/Assets/root/Runtime/Unity/Logs/LogCache.cs

@@ -34,7 +34,7 @@ public static class LogCache
 
         static string _cacheFileName = "editor-logs.txt";
         static string _cacheFile = $"{Path.Combine(_cacheFilePath, _cacheFileName)}";
-        static readonly object _fileLock = new();
+        static readonly SemaphoreSlim _fileLock = new(1, 1);
         static bool _initialized = false;
 
         public static void Initialize()
@@ -51,39 +51,52 @@ public static void Initialize()
             _initialized = true;
         }
 
-        public static void HandleLogCache()
+        public static async void HandleLogCache()
         {
             if (LogUtils.LogEntries > 0)
             {
                 var logs = LogUtils.GetAllLogs();
-                CacheLogEntries(logs);
+                await CacheLogEntriesAsync(logs);
             }
         }
 
-        public static void CacheLogEntries(LogEntry[] entries)
+        public static async Task CacheLogEntriesAsync(LogEntry[] entries)
         {
-            lock (_fileLock)
+            await _fileLock.WaitAsync();
+            try
             {
                 string data = JsonUtility.ToJson(new LogWrapper { entries = entries });
                 Directory.CreateDirectory(_cacheFilePath);
                 // Atomic File Write
-                File.WriteAllText(_cacheFile + ".tmp", data);
+                await File.WriteAllTextAsync(_cacheFile + ".tmp", data);
                 if (File.Exists(_cacheFile))
                     File.Delete(_cacheFile);
                 File.Move(_cacheFile + ".tmp", _cacheFile);
             }
+            finally
+            {
+                _fileLock.Release();
+            }
         }
-        public static ConcurrentQueue<LogEntry> GetCachedLogEntries()
+        public static async Task<ConcurrentQueue<LogEntry>> GetCachedLogEntriesAsync()
         {
-            lock (_fileLock)
+            await _fileLock.WaitAsync();
+            try
             {
                 if (!File.Exists(_cacheFile))
                 {
-                    return new();
+                    return new ConcurrentQueue<LogEntry>();
                 }
-                string json = File.ReadAllText(_cacheFile);
-                LogWrapper wrapper = JsonUtility.FromJson<LogWrapper>(json);
-                return new ConcurrentQueue<LogEntry>(wrapper.entries);
+                string json = await File.ReadAllTextAsync(_cacheFile);
+                return await Task.Run(() =>
+                {
+                    LogWrapper wrapper = JsonUtility.FromJson<LogWrapper>(json);
+                    return new ConcurrentQueue<LogEntry>(wrapper.entries);
+                });
+            }
+            finally
+            {
+                _fileLock.Release();
             }
         }
     }

Unity-MCP-Plugin/Assets/root/Runtime/Unity/Logs/LogUtils.cs

@@ -55,18 +55,18 @@ static LogUtils()
 
         public static void EnsureSubscribed()
         {
-            MainThread.Instance.RunAsync(() =>
+            MainThread.Instance.RunAsync(async () =>
             {
                 lock (_lockObject)
                 {
                     if (!_isSubscribed)
                     {
                         Application.logMessageReceivedThreaded += OnLogMessageReceived;
                         LogCache.Initialize();
-                        _logEntries = LogCache.GetCachedLogEntries();
                         _isSubscribed = true;
                     }
                 }
+                _logEntries = await LogCache.GetCachedLogEntriesAsync();
             });
         }
 

Unity-MCP-Plugin/Assets/root/Tests/Editor/Tool/Console/TestToolConsoleIntegration.cs

@@ -256,15 +256,9 @@ public IEnumerator GetLogs_Validate_LogCount()
         [UnityTest]
         public IEnumerator GetLogs_Validate_ConsoleLogRetention()
         {
-            // Wait for log collection system to process (EditMode tests can only yield null)
-            for (int i = 0; i < 30000; i++)
-            {
-                yield return null;
-            }
             // This test verifies that logs are being stored and read from the log cache properly.
             int testCount = 15;
             int startCount = LogUtils.LogEntries;
-            Assert.AreEqual(startCount, LogCache.GetCachedLogEntries().Count(), "Log entries and Log Cache count should match at the start of this test.");
             for (int i = 0; i < testCount; i++)
             {
                 Debug.Log($"Test Log {i + 1}");
@@ -274,8 +268,14 @@ public IEnumerator GetLogs_Validate_ConsoleLogRetention()
             {
                 yield return null;
             }
+            LogUtils.ClearLogs();
+            Assert.AreEqual(0, LogUtils.LogEntries, "Log entries and Log Cache count should be empty.");
+            LogUtils.EnsureSubscribed();
+            for (int i = 0; i < 10000; i++)
+            {
+                yield return null;
+            }
             Assert.AreEqual(startCount + testCount, LogUtils.LogEntries, "LogUtils should have new logs in memory.");
-            Assert.IsTrue(LogUtils.LogEntries == LogCache.GetCachedLogEntries().Count(), "Log entries and Log Cache count should match.");
         }
     }
 }