Merge pull request #116 from microsoft/bilong-watcher

Enable watcher on background thread
microsoft · May 24, 2023 · a867b48 · a867b48
2 parents 6c24883 + c964053
commit a867b48
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/EventLogExpert/Store/EventLog/EventLogReducers.cs b/src/EventLogExpert/Store/EventLog/EventLogReducers.cs
@@ -96,6 +96,11 @@ public static EventLogState ReduceSetContinouslyUpdate(EventLogState state, Even
                 Events = state.NewEventBuffer.Events.Concat(state.Events).ToList().AsReadOnly(),
                 NewEventBuffer = new(new List<DisplayEventModel>().AsReadOnly(), false)
             };
+
+            if (state.Watcher != null && !state.Watcher.IsWatching)
+            {
+                state.Watcher.StartWatching();
+            }
         }
 
         return newState;

diff --git a/src/EventLogExpert/Store/EventLog/LiveLogWatcher.cs b/src/EventLogExpert/Store/EventLog/LiveLogWatcher.cs
@@ -64,9 +64,15 @@ public void StartWatching()
             }
         };
 
-        _watcher.Enabled = true;
+        // When the watcher is enabled, it reads all the events since the
+        // last bookmark. Do this on a background thread so we don't tie
+        // up the UI.
+        Task.Run(() =>
+        {
+            _watcher.Enabled = true;
 
-        _debugLogger.Trace("LiveLogWatcher started watching.");
+            _debugLogger.Trace("LiveLogWatcher started watching.");
+        });
     }
 
     public void StopWatching()