Logger ReadLogFileBytes uses the pause and resume functions

Author: b3ncr0w

CLAUDE.md.meta

@@ -124,6 +124,8 @@ public class BugReportUI : MonoBehaviour
         private List<Issue.LogFileReference> _logFiles = new List<Issue.LogFileReference>();
 
         private static Logger _logger;
+        
+        public static Logger Logger => _logger;
         private bool _cursorStateChanged;
         private CursorLockMode _previousCursorLockMode;
 

Runtime/Scripts/BugReportUI.cs

@@ -428,53 +428,53 @@ private IEnumerator PostVideo(GameRecorder gameRecorder)
         private IEnumerator UploadFile(string endpoint, string fieldName, string filePath, string contentType)
         {
             bool isLogFile = Path.GetExtension(filePath).Equals(".log", StringComparison.OrdinalIgnoreCase);
-            if (isLogFile)
-            {
-                BugReportUI.PauseLogger();
-                yield return new WaitForSeconds(0.1f);
-            }
-            
             byte[] fileData;
-            try
-            {
-                fileData = File.ReadAllBytes(filePath);
-            }
-            catch (Exception ex)
+            
+            if (isLogFile)
             {
-                Debug.LogError($"Error reading file {filePath}: {ex.Message}");
-                if (isLogFile)
+                if (BugReportUI.Logger != null && filePath == BugReportUI.Logger.LogPath)
                 {
+                    Debug.Log("Reading log file safely using Logger instance");
+                    fileData = BugReportUI.Logger.ReadLogFileBytes();
+                    if (fileData == null)
+                    {
+                        Debug.LogError("Failed to read log file data from Logger instance");
+                        yield break;
+                    }
+                }
+                else
+                {
+                    BugReportUI.PauseLogger();
+                    
+                    try
+                    {
+                        fileData = File.ReadAllBytes(filePath);
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.LogError($"Error reading file {filePath}: {ex.Message}");
+                        BugReportUI.ResumeLogger();
+                        yield break;
+                    }
+                    
                     BugReportUI.ResumeLogger();
                 }
-                yield break;
-            }
-            
-            if (isLogFile)
-            {
-                BugReportUI.ResumeLogger();
             }
-            
-            WWWForm form = new WWWForm();
-            form.AddBinaryData(fieldName, fileData, Path.GetFileName(filePath), contentType);
-
-            string url = $"{_betahubEndpoint}projects/{_projectId}/issues/g-{Id}/{endpoint}";
-            using (UnityWebRequest www = UnityWebRequest.Post(url, form))
+            else
             {
-                www.SetRequestHeader("Authorization", "Bearer " + _updateIssueAuthToken);
-                www.SetRequestHeader("BetaHub-Project-ID", _projectId);
-                www.SetRequestHeader("Accept", "application/json");
-
-                yield return www.SendWebRequest();
-
-                if (www.result != UnityWebRequest.Result.Success)
+                // For non-log files, read normally
+                try
                 {
-                    Debug.LogError($"Error uploading {Path.GetFileName(filePath)}: {www.error}");
+                    fileData = File.ReadAllBytes(filePath);
                 }
-                else
+                catch (Exception ex)
                 {
-                    Debug.Log($"{Path.GetFileName(filePath)} uploaded successfully!");
+                    Debug.LogError($"Error reading file {filePath}: {ex.Message}");
+                    yield break;
                 }
             }
+            
+            yield return UploadStringAsFile(endpoint, fieldName, fileData, Path.GetFileName(filePath), contentType);
         }
 
         private IEnumerator UploadStringAsFile(string endpoint, string fieldName, byte[] fileData, string fileName, string contentType)

Runtime/Scripts/Issue.cs

@@ -157,7 +157,7 @@ public void ResumeLogging()
         }
 
         /// <summary>
-        /// Safely reads the entire log file by temporarily closing the file stream.
+        /// Safely reads the entire log file by temporarily pausing logging.
         /// This prevents file sharing violations when other parts of the application need to read the log.
         /// </summary>
         /// <returns>The complete log file content as a byte array, or null if an error occurs</returns>
@@ -169,47 +169,34 @@ public byte[] ReadLogFileBytes()
                 return null;
             }
 
-            lock (lockObject)
+            try
             {
-                try
+                PauseLogging();
+
+                byte[] fileData = null;
+                if (File.Exists(_logPath))
                 {
-                    // First, flush any buffered data
-                    FlushBuffer();
-
-                    // Temporarily close the file streams
-                    writer?.Dispose();
-                    fileStream?.Dispose();
-                    writer = null;
-                    fileStream = null;
-
-                    // Now we can safely read the file since we've closed our handle
-                    byte[] fileData = null;
-                    if (File.Exists(_logPath))
-                    {
-                        fileData = File.ReadAllBytes(_logPath);
-                    }
+                    fileData = File.ReadAllBytes(_logPath);
+                }
+
+                ResumeLogging();
 
-                    // Reopen the file streams to continue logging
-                    InitializeFileStream();
+                return fileData;
+            }
+            catch (Exception e)
+            {
+                Debug.LogError("Error reading log file: " + e.Message);
 
-                    return fileData;
+                try
+                {
+                    ResumeLogging();
                 }
-                catch (Exception e)
+                catch (Exception resumeEx)
                 {
-                    Debug.LogError("Error reading log file: " + e.Message);
-
-                    // Ensure we reopen the file streams even if reading failed
-                    try
-                    {
-                        InitializeFileStream();
-                    }
-                    catch (Exception reopenEx)
-                    {
-                        Debug.LogError("Error reopening log file after failed read: " + reopenEx.Message);
-                    }
-
-                    return null;
+                    Debug.LogError("Error resuming log file after failed read: " + resumeEx.Message);
                 }
+
+                return null;
             }
         }