Merge pull request #241 from ionite34/update-logging

Author: ionite34

StabilityMatrix.Core/Python/PyVenvRunner.cs

@@ -201,17 +201,14 @@ public async Task PipInstall(string args, Action<ProcessOutput>? outputDataRecei
         // Record output for errors
         var output = new StringBuilder();
 
-        var outputAction =
-            outputDataReceived == null
-                ? null
-                : new Action<ProcessOutput>(s =>
-                {
-                    Logger.Debug($"Pip output: {s.Text}");
-                    // Record to output
-                    output.Append(s.Text);
-                    // Forward to callback
-                    outputDataReceived(s);
-                });
+        var outputAction = new Action<ProcessOutput>(s =>
+        {
+            Logger.Debug($"Pip output: {s.Text}");
+            // Record to output
+            output.Append(s.Text);
+            // Forward to callback
+            outputDataReceived?.Invoke(s);
+        });
 
         SetPyvenvCfg(PyRunner.PythonDir);
         RunDetached($"-m pip install {args}", outputAction);
@@ -427,9 +424,18 @@ public async ValueTask DisposeAsync()
         if (Process is { HasExited: false })
         {
             Process.Kill();
-            await Process
-                .WaitForExitAsync(new CancellationTokenSource(1000).Token)
-                .ConfigureAwait(false);
+            try
+            {
+                await Process
+                    .WaitForExitAsync(new CancellationTokenSource(1000).Token)
+                    .ConfigureAwait(false);
+            }
+            catch (OperationCanceledException e)
+            {
+                Logger.Error(e, "Venv Process did not exit in time in DisposeAsync");
+
+                Process.CancelStreamReaders();
+            }
         }
 
         Process = null;