React to dotnet/runtime#115494

Author: jkotas

src/Hosting/Hosting/src/Internal/WebHostLifetime.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Runtime.InteropServices;
+
 namespace Microsoft.AspNetCore.Hosting;
 
 internal sealed class WebHostLifetime : IDisposable
@@ -9,22 +11,22 @@ internal sealed class WebHostLifetime : IDisposable
     private readonly ManualResetEventSlim _resetEvent;
     private readonly string _shutdownMessage;
 
+    private PosixSignalRegistration _sigIntRegistration;
+    private PosixSignalRegistration _sigQuitRegistration;
+    private PosixSignalRegistration _sigTermRegistration;
+
     private bool _disposed;
-    private bool _exitedGracefully;
 
     public WebHostLifetime(CancellationTokenSource cts, ManualResetEventSlim resetEvent, string shutdownMessage)
     {
         _cts = cts;
         _resetEvent = resetEvent;
         _shutdownMessage = shutdownMessage;
 
-        AppDomain.CurrentDomain.ProcessExit += ProcessExit;
-        Console.CancelKeyPress += CancelKeyPress;
-    }
-
-    internal void SetExitedGracefully()
-    {
-        _exitedGracefully = true;
+        Action<PosixSignalContext> handler = HandlePosixSignal;
+        _sigIntRegistration = PosixSignalRegistration.Create(PosixSignal.SIGINT, handler);
+        _sigQuitRegistration = PosixSignalRegistration.Create(PosixSignal.SIGQUIT, handler);
+        _sigTermRegistration = PosixSignalRegistration.Create(PosixSignal.SIGTERM, handler);
     }
 
     public void Dispose()
@@ -35,26 +37,18 @@ public void Dispose()
         }
 
         _disposed = true;
-        AppDomain.CurrentDomain.ProcessExit -= ProcessExit;
-        Console.CancelKeyPress -= CancelKeyPress;
-    }
 
-    private void CancelKeyPress(object? sender, ConsoleCancelEventArgs eventArgs)
-    {
-        Shutdown();
-        // Don't terminate the process immediately, wait for the Main thread to exit gracefully.
-        eventArgs.Cancel = true;
+        _sigIntRegistration.Dispose() ;
+        _sigQuitRegistration.Dispose();
+        _sigTermRegistration.Dispose();
     }
 
-    private void ProcessExit(object? sender, EventArgs eventArgs)
+    private void HandlePosixSignal(PosixSignalContext context)
     {
         Shutdown();
-        if (_exitedGracefully)
-        {
-            // On Linux if the shutdown is triggered by SIGTERM then that's signaled with the 143 exit code.
-            // Suppress that since we shut down gracefully. https://github.com/dotnet/aspnetcore/issues/6526
-            Environment.ExitCode = 0;
-        }
+
+        // Don't terminate the process immediately, wait for the Main thread to exit gracefully.
+        context.Cancel = true;
     }
 
     private void Shutdown()

src/Hosting/Hosting/src/WebHostExtensions.cs

@@ -52,7 +52,6 @@ public static async Task WaitForShutdownAsync(this IWebHost host, CancellationTo
                 try
                 {
                     await host.WaitForTokenShutdownAsync(cts.Token);
-                    lifetime.SetExitedGracefully();
                 }
                 finally
                 {
@@ -95,7 +94,6 @@ public static async Task RunAsync(this IWebHost host, CancellationToken token =
                 try
                 {
                     await host.RunAsync(cts.Token, "Application started. Press Ctrl+C to shut down.");
-                    lifetime.SetExitedGracefully();
                 }
                 finally
                 {