Be more selective about process shutdown signals

Author: nblumhardt

src/SeqCli/Cli/Commands/Forwarder/RunCommand.cs

@@ -17,6 +17,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Net;
+using System.Threading;
 using System.Threading.Tasks;
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
@@ -206,23 +207,45 @@ static async Task<int> RunStandardIOAsync(ServerService service, TextWriter cout
     {
         service.Start();
 
-        try
+        var waitForShutDownRequest = new TaskCompletionSource();
+        var done = new ManualResetEventSlim(false);
+
+        void ShutDown()
         {
-            Console.TreatControlCAsInput = true;
-            var k = Console.ReadKey(true);
-            while (k.Key != ConsoleKey.C || !k.Modifiers.HasFlag(ConsoleModifiers.Control))
-                k = Console.ReadKey(true);
+            waitForShutDownRequest.TrySetResult();
+            done.Wait();
+        }
 
-            cout.WriteLine("Ctrl+C pressed; stopping...");
+        try
+        {
             Console.TreatControlCAsInput = false;
+            Console.CancelKeyPress += (_, _) =>
+            {
+                cout.WriteLine("Ctrl+C pressed; stopping...");
+                Log.Information("Interrupt signal received");
+                ShutDown();
+            };
         }
-        catch (Exception ex)
+        catch (IOException)
         {
-            Log.Debug(ex, "Console not attached, waiting for any input");
-            Console.Read();
+            Log.Information("Disabling Ctrl+C handling; process is non-interactive");
         }
 
-        await service.StopAsync();
+        AppDomain.CurrentDomain.ProcessExit += (_, _) =>
+        {
+            Log.Information("Termination signal received");
+            ShutDown();
+        };
+
+        try
+        {
+            await waitForShutDownRequest.Task;
+            await service.StopAsync();
+        }
+        finally
+        {
+            done.Set();
+        }
 
         return 0;
     }

test/SeqCli.EndToEnd/Support/CaptiveProcess.cs

@@ -15,7 +15,7 @@ public sealed class CaptiveProcess : ITestProcess, IDisposable
     readonly ManualResetEvent _outputComplete = new(false);
     readonly ManualResetEvent _errorComplete = new(false);
 
-    readonly object _sync = new();
+    readonly Lock _sync = new();
     readonly StringWriter _output = new();
 
     public CaptiveProcess(
@@ -27,7 +27,7 @@ public CaptiveProcess(
         string stopCommandFullExePath = null,
         string stopCommandArgs = null)
     {
-        if (fullExePath == null) throw new ArgumentNullException(nameof(fullExePath));
+        ArgumentNullException.ThrowIfNull(fullExePath);
         _captureOutput = captureOutput;
         _stopCommandFullExePath = stopCommandFullExePath;
         _stopCommandArgs = stopCommandArgs;