Use CreateStaticLogger for command loggers

Author: abparticular

src/ServiceControl.AcceptanceTests.RavenDB/StartupModeTests.cs

@@ -58,7 +58,7 @@ public async Task CanRunMaintenanceMode()
         public async Task CanRunImportFailedMessagesMode()
             => await new TestableImportFailedErrorsCommand().Execute(new HostArguments(Array.Empty<string>()), settings);
 
-        class TestableImportFailedErrorsCommand() : ImportFailedErrorsCommand(NullLogger<ImportFailedErrorsCommand>.Instance)
+        class TestableImportFailedErrorsCommand() : ImportFailedErrorsCommand()
         {
             protected override EndpointConfiguration CreateEndpointConfiguration(Settings settings)
             {

src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs

@@ -103,7 +103,7 @@ async Task InitializeServiceControl(ScenarioContext context)
 
             using (new DiagnosticTimer($"Creating infrastructure for {instanceName}"))
             {
-                var setupCommand = new SetupCommand(NullLogger<SetupCommand>.Instance);
+                var setupCommand = new SetupCommand();
                 await setupCommand.Execute(new HostArguments([]), settings);
             }
 

src/ServiceControl.Audit/Infrastructure/Hosting/Commands/ImportFailedAuditsCommand.cs

@@ -8,9 +8,10 @@
     using Microsoft.Extensions.Hosting;
     using Microsoft.Extensions.Logging;
     using NServiceBus;
+    using ServiceControl.Infrastructure;
     using Settings;
 
-    class ImportFailedAuditsCommand(ILogger<ImportFailedAuditsCommand> logger) : AbstractCommand
+    class ImportFailedAuditsCommand : AbstractCommand
     {
         public override async Task Execute(HostArguments args, Settings settings)
         {
@@ -40,7 +41,7 @@ public override async Task Execute(HostArguments args, Settings settings)
             }
             catch (OperationCanceledException e) when (tokenSource.IsCancellationRequested)
             {
-                logger.LogInformation(e, "Cancelled");
+                LoggerUtil.CreateStaticLogger<ImportFailedAuditsCommand>().LogInformation(e, "Cancelled");
             }
             finally
             {

src/ServiceControl.Audit/Infrastructure/Hosting/Commands/SetupCommand.cs

@@ -9,7 +9,7 @@
     using Settings;
     using Transports;
 
-    class SetupCommand() : AbstractCommand
+    class SetupCommand : AbstractCommand
     {
         public override async Task Execute(HostArguments args, Settings settings)
         {

src/ServiceControl/Hosting/Commands/ImportFailedErrorsCommand.cs

@@ -12,8 +12,9 @@
     using Particular.ServiceControl;
     using Particular.ServiceControl.Hosting;
     using ServiceBus.Management.Infrastructure.Settings;
+    using ServiceControl.Infrastructure;
 
-    class ImportFailedErrorsCommand(ILogger<ImportFailedErrorsCommand> logger) : AbstractCommand
+    class ImportFailedErrorsCommand : AbstractCommand
     {
         public override async Task Execute(HostArguments args, Settings settings)
         {
@@ -41,7 +42,7 @@ public override async Task Execute(HostArguments args, Settings settings)
             }
             catch (OperationCanceledException e) when (tokenSource.IsCancellationRequested)
             {
-                logger.LogInformation(e, "Cancelled");
+                LoggerUtil.CreateStaticLogger<ImportFailedErrorsCommand>().LogInformation(e, "Cancelled");
             }
             finally
             {

src/ServiceControl/Hosting/Commands/SetupCommand.cs

@@ -8,9 +8,10 @@
     using Particular.ServiceControl.Hosting;
     using ServiceBus.Management.Infrastructure.Installers;
     using ServiceBus.Management.Infrastructure.Settings;
+    using ServiceControl.Infrastructure;
     using Transports;
 
-    class SetupCommand(ILogger<SetupCommand> logger) : AbstractCommand
+    class SetupCommand : AbstractCommand
     {
         public override async Task Execute(HostArguments args, Settings settings)
         {
@@ -35,7 +36,7 @@ public override async Task Execute(HostArguments args, Settings settings)
 
             if (args.SkipQueueCreation)
             {
-                logger.LogInformation("Skipping queue creation");
+                LoggerUtil.CreateStaticLogger<SetupCommand>().LogInformation("Skipping queue creation");
             }
             else
             {