Improve logging

RemoteExec.Client/RemoteExecLoggerProvider.cs

@@ -0,0 +1,34 @@
+using Microsoft.Extensions.Logging;
+
+namespace RemoteExec.Client;
+
+internal class RemoteExecLoggerProvider : ILoggerProvider
+{
+    private bool disposedValue;
+    private readonly ILogger logger;
+
+    public RemoteExecLoggerProvider(ILogger logger)
+    {
+        this.logger = logger;
+    }
+
+    public ILogger CreateLogger(string categoryName)
+    {
+        return logger;
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!disposedValue)
+        {
+            // No managed or unmanaged resources to dispose
+            disposedValue = true;
+        }
+    }
+
+    public void Dispose()
+    {
+        Dispose(disposing: true);
+        GC.SuppressFinalize(this);
+    }
+}

RemoteExec.Client/RemoteExecutor.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 
 using RemoteExec.Shared;
 
@@ -19,18 +20,35 @@ public class RemoteExecutor : IDisposable
     private CancellationTokenSource distributorCts = new();
     private Task? distributorTask;
     private readonly LoadBalancingStrategy loadBalancingStrategy;
-
+    private readonly ILogger logger;
     private bool disposedValue;
 
     public event EventHandler<ServerMetricsUpdatedEventArgs>? MetricsUpdated;
 
-    public RemoteExecutor(string url) : this([url], LoadBalancingStrategy.ResourceAware)
+    public RemoteExecutor(string url) : this([url], LoadBalancingStrategy.ResourceAware, NullLogger.Instance)
     {
     }
 
-    public RemoteExecutor(string[] urls, LoadBalancingStrategy loadBalancingStrategy = LoadBalancingStrategy.ResourceAware)
+    public RemoteExecutor(string url, ILogger logger) : this([url], LoadBalancingStrategy.ResourceAware, logger)
+    {
+    }
+
+    public RemoteExecutor(string url, LoadBalancingStrategy loadBalancingStrategy) : this([url], loadBalancingStrategy, NullLogger.Instance)
+    {
+    }
+
+    public RemoteExecutor(string[] urls) : this(urls, LoadBalancingStrategy.ResourceAware, NullLogger.Instance)
+    {
+    }
+
+    public RemoteExecutor(string[] urls, LoadBalancingStrategy loadBalancingStrategy) : this(urls, loadBalancingStrategy, NullLogger.Instance)
+    {
+    }
+
+    public RemoteExecutor(string[] urls, LoadBalancingStrategy loadBalancingStrategy, ILogger logger)
     {
         this.loadBalancingStrategy = loadBalancingStrategy;
+        this.logger = logger;
 
         foreach (string url in urls)
         {
@@ -42,7 +60,7 @@ public class RemoteExecutor : IDisposable
                 .WithAutomaticReconnect()
                 .ConfigureLogging(logging =>
                 {
-                    _ = logging.AddProvider(new RemoteExecLoggerProvider());
+                    _ = logging.AddProvider(new RemoteExecLoggerProvider(logger));
                 })
                 .Build();
 
@@ -106,6 +124,8 @@ public class RemoteExecutor : IDisposable
 
     public async Task StopAsync(CancellationToken cancellationToken = default)
     {
+        logger.LogInformation("Stopping RemoteExecutor...");
+
         await distributorCts.CancelAsync();
 
         if (distributorTask != null)
@@ -113,13 +133,15 @@ public class RemoteExecutor : IDisposable
             try
             {
                 await distributorTask;
+                logger.LogDebug("Distributor task completed successfully");
             }
-            catch (OperationCanceledException)
+            catch (OperationCanceledException ex)
             {
-                // Expected
+                logger.LogError(ex, "Distributor task was canceled");
             }
         }
 
+        logger.LogDebug("Completing task channels for {ServerCount} servers", servers.Count);
         foreach (ServerConnection server in servers)
         {
             server.TaskChannel.Writer.Complete();
@@ -133,6 +155,7 @@ public class RemoteExecutor : IDisposable
         }
 
         await Task.WhenAll(stopTasks);
+        logger.LogInformation("RemoteExecutor stopped successfully");
     }
 
     public Dictionary<string, ServerMetrics> GetCurrentServerMetrics()
@@ -315,34 +338,3 @@ public class RemoteExecutor : IDisposable
         GC.SuppressFinalize(this);
     }
 }
-
-internal class RemoteExecLoggerProvider : ILoggerProvider
-{
-    public ILogger CreateLogger(string categoryName)
-    {
-        return new RemoteExecLogger();
-    }
-
-    public void Dispose()
-    {
-        throw new NotImplementedException();
-    }
-}
-
-internal class RemoteExecLogger : ILogger
-{
-    public IDisposable? BeginScope<TState>(TState state) where TState : notnull
-    {
-        return null;
-    }
-
-    public bool IsEnabled(LogLevel logLevel)
-    {
-        return true;
-    }
-
-    public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
-    {
-        Console.WriteLine($"[{logLevel}] {formatter(state, exception)}");
-    }
-}