From d8d5f2794b2efb7aae6d262e87df7dac8538116c Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Sun, 24 Jul 2022 09:54:31 -0230 Subject: [PATCH] Limited retries when ancillary files are locked. (#90) * Limited retries when anciliary files are locked. * Move sleep to top of loop. --- ObservatoryCore/LogMonitor.cs | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/ObservatoryCore/LogMonitor.cs b/ObservatoryCore/LogMonitor.cs index fd73662..c75f1a3 100644 --- a/ObservatoryCore/LogMonitor.cs +++ b/ObservatoryCore/LogMonitor.cs @@ -345,13 +345,29 @@ namespace Observatory // I have no idea what order Elite writes these files or if they're already written // by the time the journal updates. // Brief sleep to ensure the content is updated before we read it. - System.Threading.Thread.Sleep(50); - - string fileContent = File.ReadAllText(journalWatcher.Path + Path.DirectorySeparatorChar + filename); - - var fileObject = DeserializeToEventArgs(eventType + "File", fileContent); - JournalEntry?.Invoke(this, fileObject); + + // Some files are still locked by another process after 50ms. + // Retry every 50ms for 0.5 seconds before giving up. + string fileContent = null; + int retryCount = 0; + + while (fileContent == null || retryCount < 10) + { + System.Threading.Thread.Sleep(50); + try + { + using var fileStream = File.Open(journalWatcher.Path + Path.DirectorySeparatorChar + filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); + using var reader = new StreamReader(fileStream); + fileContent = reader.ReadToEnd(); + var fileObject = DeserializeToEventArgs(eventType + "File", fileContent); + JournalEntry?.Invoke(this, fileObject); + } + catch + { + retryCount++; + } + } } private void ReportErrors(List<(Exception ex, string file, string line)> readErrors)