From e300a8fe9bee6c512b2b33f1f9c000a3e5c9af35 Mon Sep 17 00:00:00 2001
From: Bela VanderVoort <bela.vandervoort@optimizely.com>
Date: Sun, 2 Jun 2024 14:13:37 -0500
Subject: [PATCH] fixing a couple other things

---
 Src/CSharpier.Cli/Program.cs                  |  7 +------
 .../Server/CSharpierServiceImplementation.cs  | 19 ++++++-------------
 Src/CSharpier.Cli/Server/ServerFormatter.cs   | 11 +++++++----
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/Src/CSharpier.Cli/Program.cs b/Src/CSharpier.Cli/Program.cs
index 7b4b2b6db..5e1ace75b 100644
--- a/Src/CSharpier.Cli/Program.cs
+++ b/Src/CSharpier.Cli/Program.cs
@@ -56,12 +56,7 @@ CancellationToken cancellationToken
 
         if (server)
         {
-            return await ServerFormatter.StartServer(
-                serverPort,
-                logger,
-                actualConfigPath,
-                cancellationToken
-            );
+            return await ServerFormatter.StartServer(serverPort, logger, actualConfigPath);
         }
 
         var directoryOrFileNotProvided = directoryOrFile is null or { Length: 0 };
diff --git a/Src/CSharpier.Cli/Server/CSharpierServiceImplementation.cs b/Src/CSharpier.Cli/Server/CSharpierServiceImplementation.cs
index 771340fcc..ee1364f39 100644
--- a/Src/CSharpier.Cli/Server/CSharpierServiceImplementation.cs
+++ b/Src/CSharpier.Cli/Server/CSharpierServiceImplementation.cs
@@ -2,19 +2,11 @@ namespace CSharpier.Cli.Server;
 
 using System.IO.Abstractions;
 using CSharpier.Cli.Options;
+using Microsoft.Extensions.Logging;
 
-internal class CSharpierServiceImplementation
+internal class CSharpierServiceImplementation(string? configPath, ILogger logger)
 {
-    private readonly string? configPath;
-    private readonly IFileSystem fileSystem;
-    private readonly ConsoleLogger logger;
-
-    public CSharpierServiceImplementation(string? configPath, ConsoleLogger logger)
-    {
-        this.configPath = configPath;
-        this.logger = logger;
-        this.fileSystem = new FileSystem();
-    }
+    private readonly IFileSystem fileSystem = new FileSystem();
 
     public async Task<FormatFileResult> FormatFile(
         FormatFileParameter formatFileParameter,
@@ -23,6 +15,7 @@ CancellationToken cancellationToken
     {
         try
         {
+            logger.LogInformation("Received request to format " + formatFileParameter.fileName);
             var directoryName = this.fileSystem.Path.GetDirectoryName(formatFileParameter.fileName);
             DebugLogger.Log(directoryName ?? string.Empty);
             if (directoryName == null)
@@ -34,9 +27,9 @@ CancellationToken cancellationToken
 
             var optionsProvider = await OptionsProvider.Create(
                 directoryName,
-                this.configPath,
+                configPath,
                 this.fileSystem,
-                this.logger,
+                logger,
                 cancellationToken
             );
 
diff --git a/Src/CSharpier.Cli/Server/ServerFormatter.cs b/Src/CSharpier.Cli/Server/ServerFormatter.cs
index ed5dc2005..e7588446f 100644
--- a/Src/CSharpier.Cli/Server/ServerFormatter.cs
+++ b/Src/CSharpier.Cli/Server/ServerFormatter.cs
@@ -15,15 +15,14 @@ internal static class ServerFormatter
     public static async Task<int> StartServer(
         int? port,
         ConsoleLogger logger,
-        string? actualConfigPath,
-        CancellationToken cancellationToken
+        string? actualConfigPath
     )
     {
         var builder = WebApplication.CreateBuilder();
         builder.WebHost.ConfigureKestrel(
             (_, serverOptions) =>
             {
-                serverOptions.Listen(IPAddress.Loopback, 0);
+                serverOptions.Listen(IPAddress.Loopback, port ?? 0);
             }
         );
         builder.Logging.ClearProviders();
@@ -54,7 +53,11 @@ var address in (app as IApplicationBuilder)
                 logger.LogInformation("Started on " + uri.Port);
             }
         });
-        var service = new CSharpierServiceImplementation(actualConfigPath, logger);
+        var service = new CSharpierServiceImplementation(
+            actualConfigPath,
+            // we want any further logging to happen in the file log, not out to the console
+            app.Services.GetRequiredService<ILogger<CSharpierServiceImplementation>>()
+        );
         app.MapPost(
             "/format",
             (FormatFileParameter formatFileDto, CancellationToken cancellationToken) =>