revert accidental checkin for primary instance

Author: PhilBastian

src/ServiceControl/Operations/ErrorIngestion.cs

@@ -9,8 +9,8 @@
     using Infrastructure;
     using Infrastructure.Metrics;
     using Microsoft.Extensions.Hosting;
-    using Microsoft.Extensions.Logging;
     using NServiceBus;
+    using NServiceBus.Logging;
     using NServiceBus.Transport;
     using Persistence;
     using Persistence.UnitOfWork;
@@ -66,7 +66,7 @@ public ErrorIngestion(
                 ingestionState.ReportError,
                 ingestionState.Clear,
                 settings.TimeToRestartErrorIngestionAfterFailure,
-                logger
+                Logger
             );
         }
 
@@ -109,11 +109,11 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
                         if (e is OperationCanceledException && stoppingToken.IsCancellationRequested)
                         {
-                            logger.LogInformation(e, "Batch cancelled");
+                            Logger.Info("Batch cancelled", e);
                             break;
                         }
 
-                        logger.LogInformation(e, "Ingesting messages failed");
+                        Logger.Info("Ingesting messages failed", e);
                     }
                     finally
                     {
@@ -146,7 +146,7 @@ public override async Task StopAsync(CancellationToken cancellationToken)
                     }
                     catch (OperationCanceledException e) when (cancellationToken.IsCancellationRequested)
                     {
-                        logger.LogInformation(e, "Shutdown cancelled");
+                        Logger.Info("Shutdown cancelled", e);
                     }
                 }
             }
@@ -160,7 +160,7 @@ async Task EnsureStarted(CancellationToken cancellationToken = default)
 
                 var canIngest = unitOfWorkFactory.CanIngestMore();
 
-                logger.LogDebug("Ensure started {CanIngest}", canIngest);
+                Logger.DebugFormat("Ensure started {0}", canIngest);
 
                 if (canIngest)
                 {
@@ -194,13 +194,13 @@ async Task SetUpAndStartInfrastructure(CancellationToken cancellationToken)
         {
             if (messageReceiver != null)
             {
-                logger.LogDebug("Infrastructure already Started");
+                Logger.Debug("Infrastructure already Started");
                 return;
             }
 
             try
             {
-                logger.LogInformation("Starting infrastructure");
+                Logger.Info("Starting infrastructure");
                 transportInfrastructure = await transportCustomization.CreateTransportInfrastructure(
                     errorQueue,
                     transportSettings,
@@ -219,24 +219,24 @@ async Task SetUpAndStartInfrastructure(CancellationToken cancellationToken)
 
                 await messageReceiver.StartReceive(cancellationToken);
 
-                logger.LogInformation(LogMessages.StartedInfrastructure);
+                Logger.Info(LogMessages.StartedInfrastructure);
             }
             catch (Exception e)
             {
-                logger.LogError(e, "Failed to start infrastructure");
+                Logger.Error("Failed to start infrastructure", e);
                 throw;
             }
         }
         async Task StopAndTeardownInfrastructure(CancellationToken cancellationToken)
         {
             if (transportInfrastructure == null)
             {
-                logger.LogDebug("Infrastructure already Stopped");
+                Logger.Debug("Infrastructure already Stopped");
                 return;
             }
             try
             {
-                logger.LogInformation("Stopping infrastructure");
+                Logger.Info("Stopping infrastructure");
                 try
                 {
                     if (messageReceiver != null)
@@ -252,11 +252,11 @@ async Task StopAndTeardownInfrastructure(CancellationToken cancellationToken)
                 messageReceiver = null;
                 transportInfrastructure = null;
 
-                logger.LogInformation(LogMessages.StoppedInfrastructure);
+                Logger.Info(LogMessages.StoppedInfrastructure);
             }
             catch (Exception e)
             {
-                logger.LogError(e, "Failed to stop infrastructure");
+                Logger.Error("Failed to stop infrastructure", e);
                 throw;
             }
         }
@@ -284,7 +284,7 @@ async Task OnMessage(MessageContext messageContext, CancellationToken cancellati
 
         Task OnCriticalError(string failure, Exception exception)
         {
-            logger.LogCritical(exception, "OnCriticalError. '{FailureMessage}'", failure);
+            Logger.Fatal($"OnCriticalError. '{failure}'", exception);
             return watchdog.OnFailure(failure);
         }
 
@@ -322,7 +322,7 @@ async Task EnsureStopped(CancellationToken cancellationToken = default)
         readonly IIngestionUnitOfWorkFactory unitOfWorkFactory;
         readonly IHostApplicationLifetime applicationLifetime;
 
-        static readonly ILogger<ErrorIngestion> logger;
+        static readonly ILog Logger = LogManager.GetLogger<ErrorIngestion>();
 
         internal static class LogMessages
         {

src/ServiceControl/ServiceControl.csproj

@@ -32,7 +32,6 @@
     <PackageReference Include="NServiceBus.CustomChecks" />
     <PackageReference Include="NServiceBus.Extensions.Hosting" />
     <PackageReference Include="NServiceBus.Extensions.Logging" />
-    <PackageReference Include="Seq.Extensions.Logging" />
     <PackageReference Include="ServiceControl.Contracts" />
     <PackageReference Include="System.Reactive.Linq" />
     <PackageReference Include="Yarp.ReverseProxy" />