Fix dispose not being invoked and aligned all command runners to use …

…`using var`
Particular · Jan 16, 2024 · 22d52b4 · 22d52b4
1 parent f2894e4
commit 22d52b4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/src/ServiceControl.Audit/Infrastructure/Hosting/Commands/RunCommand.cs b/src/ServiceControl.Audit/Infrastructure/Hosting/Commands/RunCommand.cs
@@ -7,7 +7,7 @@
 
     class RunCommand : AbstractCommand
     {
-        public override Task Execute(HostArguments args, Settings settings)
+        public override async Task Execute(HostArguments args, Settings settings)
         {
             var runAsWindowsService = args.RunAsWindowsService;
             var busConfiguration = new EndpointConfiguration(settings.ServiceName);
@@ -16,22 +16,23 @@ public override Task Execute(HostArguments args, Settings settings)
 
             var loggingSettings = new LoggingSettings(settings.ServiceName);
 
-            var host = new Bootstrapper(
+            var hostBuilder = new Bootstrapper(
                 (_, __) => Task.CompletedTask, //Do nothing. The transports in NSB 8 are designed to handle broker outages. Audit ingestion will be paused when broker is unavailable.
                 settings,
                 busConfiguration,
                 loggingSettings).HostBuilder;
 
             if (runAsWindowsService)
             {
-                host.UseWindowsService();
+                hostBuilder.UseWindowsService();
             }
             else
             {
-                host.UseConsoleLifetime();
+                hostBuilder.UseConsoleLifetime();
             }
 
-            return host.Build().RunAsync();
+            using var host = hostBuilder.Build();
+            await host.RunAsync();
         }
     }
 }
diff --git a/src/ServiceControl.Audit/Infrastructure/MaintenanceBootstrapper.cs b/src/ServiceControl.Audit/Infrastructure/MaintenanceBootstrapper.cs
@@ -22,15 +22,18 @@ public static async Task Run(HostArguments args, Settings.Settings settings)
             {
                 hostBuilder.UseWindowsService();
 
-                await hostBuilder.Build().RunAsync();
+                using var host = hostBuilder.Build();
+                await host.RunAsync();
             }
             else
             {
                 hostBuilder.UseConsoleLifetime();
 
                 await Console.Out.WriteLineAsync("Running in Maintenance Mode - Press CTRL+C to exit");
 
-                await hostBuilder.Build().RunAsync();
+                using var host = hostBuilder.Build();
+
+                await host.RunAsync();
 
                 await Console.Out.WriteLineAsync("Disposing persister (this might take a while)...");
             }

diff --git a/src/ServiceControl.Monitoring/Hosting/Commands/RunCommand.cs b/src/ServiceControl.Monitoring/Hosting/Commands/RunCommand.cs
@@ -25,10 +25,8 @@ public override async Task Execute(Settings settings)
                 hostBuilder.UseConsoleLifetime();
             }
 
-            using (var host = hostBuilder.Build())
-            {
-                await host.RunAsync();
-            }
+            using var host = hostBuilder.Build();
+            await host.RunAsync();
         }
     }
 }
diff --git a/src/ServiceControl/Hosting/Commands/ImportFailedErrorsCommand.cs b/src/ServiceControl/Hosting/Commands/ImportFailedErrorsCommand.cs
@@ -29,7 +29,7 @@ public override async Task Execute(HostArguments args, Settings settings)
             // TODO: Ideally we would never want to actually bootstrap the web api. Figure out how
             var hostBuilder = WebApplication.CreateBuilder();
             hostBuilder.AddServiceControl(settings, endpointConfiguration, loggingSettings);
-            var app = hostBuilder.Build();
+            using var app = hostBuilder.Build();
 
             app.UseServiceControl();
             await app.StartServiceControl();

diff --git a/src/ServiceControl/Hosting/Commands/RunCommand.cs b/src/ServiceControl/Hosting/Commands/RunCommand.cs
@@ -23,7 +23,7 @@ public override async Task Execute(HostArguments args, Settings settings)
 
             var hostBuilder = WebApplication.CreateBuilder();
             hostBuilder.AddServiceControl(settings, endpointConfiguration, loggingSettings);
-            var app = hostBuilder.Build();
+            using var app = hostBuilder.Build();
 
             app.UseServiceControl();
             await app.StartServiceControl();