Add the WindowsServiceCustomLifetime to request additional time on stop to the audit instance

Author: mauroservienti

src/ServiceControl.Audit/HostApplicationBuilderExtensions.cs

@@ -6,6 +6,7 @@ namespace ServiceControl.Audit;
 using System.Threading.Tasks;
 using Auditing;
 using Infrastructure;
+using Infrastructure.Hosting;
 using Infrastructure.Settings;
 using Microsoft.AspNetCore.HttpLogging;
 using Microsoft.Extensions.DependencyInjection;
@@ -105,7 +106,7 @@ public static void AddServiceControlAudit(this IHostApplicationBuilder builder,
         {
             // The if is added for clarity, internally AddWindowsService has a similar logic
             builder.Services.AddWindowsService();
-            //TODO register our own lifecycle that replaces the WindowsService default one
+            builder.Services.AddSingleton<IHostLifetime, WindowsServiceCustomLifetime>();
         }
     }
 

src/ServiceControl.Audit/Infrastructure/Hosting/WindowsServiceCustomLifetime.cs

@@ -0,0 +1,30 @@
+namespace ServiceControl.Audit.Infrastructure.Hosting;
+
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Hosting.WindowsServices;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Settings;
+
+class WindowsServiceCustomLifetime : WindowsServiceLifetime
+{
+    public WindowsServiceCustomLifetime(IHostEnvironment environment, IHostApplicationLifetime applicationLifetime, ILoggerFactory loggerFactory, IOptions<HostOptions> optionsAccessor, Settings settings)
+        : base(environment, applicationLifetime, loggerFactory, optionsAccessor)
+    {
+        this.settings = settings;
+    }
+
+    public WindowsServiceCustomLifetime(IHostEnvironment environment, IHostApplicationLifetime applicationLifetime, ILoggerFactory loggerFactory, IOptions<HostOptions> optionsAccessor, IOptions<WindowsServiceLifetimeOptions> windowsServiceOptionsAccessor, Settings settings)
+        : base(environment, applicationLifetime, loggerFactory, optionsAccessor, windowsServiceOptionsAccessor)
+    {
+        this.settings = settings;
+    }
+
+    protected override void OnStop()
+    {
+        RequestAdditionalTime(settings.ShutdownTimeout);
+        base.OnStop();
+    }
+
+    readonly Settings settings;
+}