Improve cli logger

Author: Aeliux

src/EasySign.Cli/BundleCommandProvider.cs

@@ -22,6 +22,7 @@ public BundleCommandProvider(ILogger logger)
 
         public override void InitializeBundle(string bundlePath)
         {
+            Program.Logger.Information("Initializing bundle at {bundlePath}", bundlePath);
             Bundle = new Bundle(bundlePath, _logger);
         }
 

src/EasySign.Cli/EasySign.Cli.csproj

@@ -30,6 +30,7 @@
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" PrivateAssets="All" />
     <PackageReference Include="Serilog" Version="4.2.0" />
+    <PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
   </ItemGroup>

src/EasySign.Cli/Program.cs

@@ -16,29 +16,41 @@ namespace SAPTeam.EasySign.Cli
 {
     internal class Program
     {
+        public static Serilog.ILogger Logger { get; private set; }
+
         static int Main(string[] args)
         {
             Log.Logger = new LoggerConfiguration()
-                .WriteTo.File(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "logs/log-.txt"), rollingInterval: RollingInterval.Day, shared: true)
+                .Enrich.WithThreadId()
+                .WriteTo.File(
+                    Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "logs/log-.txt"),
+                    rollingInterval: RollingInterval.Day,
+                    outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff} [{Level:u3}] {Context}({ThreadId}) - {Message} {NewLine}{Exception}"
+                )
                 .MinimumLevel.Debug() // Minimum log level
                 .CreateLogger();
 
             var serviceCollection = new ServiceCollection();
             serviceCollection.AddLogging(configure =>
             {
                 configure.ClearProviders(); // Clear default providers
-                configure.AddSerilog();
+                configure.AddSerilog(Log.Logger.ForContext("Context", "Bundle"));
             });
 
             var serviceProvider = serviceCollection.BuildServiceProvider();
 
             // Resolve an ILogger instance
-            var logger = serviceProvider.GetRequiredService<ILogger<Program>>();
-            logger.BeginScope("EasySign.Cli started at " + DateTime.Now);
+            var bundleLogger = serviceProvider.GetRequiredService<ILogger<Bundle>>();
+
+            Logger = Log.Logger.ForContext("Context", "Main");
+            Logger.Information("Starting EasySign CLI at {DateTime}", DateTime.Now);
 
-            var root = new BundleCommandProvider(logger).GetRootCommand();
+            var root = new BundleCommandProvider(bundleLogger).GetRootCommand();
             var exitCode = root.Invoke(args);
 
+            Logger.Information("Shutting down EasySign CLI at {DateTime} with exit code {ExitCode}", DateTime.Now, exitCode);
+
+            Log.CloseAndFlush();
             return exitCode;
         }
 

src/EasySign.Cli/packages.lock.json

@@ -14,6 +14,15 @@
         "resolved": "4.2.0",
         "contentHash": "gmoWVOvKgbME8TYR+gwMf7osROiWAURterc6Rt2dQyX7wtjZYpqFiA/pY6ztjGQKKV62GGCyOcmtP1UKMHgSmA=="
       },
+      "Serilog.Enrichers.Thread": {
+        "type": "Direct",
+        "requested": "[4.0.0, )",
+        "resolved": "4.0.0",
+        "contentHash": "C7BK25a1rhUyr+Tp+1BYcVlBJq7M2VCHlIgnwoIUVJcicM9jYcvQK18+OeHiXw7uLPSjqWxJIp1EfaZ/RGmEwA==",
+        "dependencies": {
+          "Serilog": "4.0.0"
+        }
+      },
       "Serilog.Extensions.Logging": {
         "type": "Direct",
         "requested": "[9.0.1, )",
@@ -160,6 +169,15 @@
         "resolved": "4.2.0",
         "contentHash": "gmoWVOvKgbME8TYR+gwMf7osROiWAURterc6Rt2dQyX7wtjZYpqFiA/pY6ztjGQKKV62GGCyOcmtP1UKMHgSmA=="
       },
+      "Serilog.Enrichers.Thread": {
+        "type": "Direct",
+        "requested": "[4.0.0, )",
+        "resolved": "4.0.0",
+        "contentHash": "C7BK25a1rhUyr+Tp+1BYcVlBJq7M2VCHlIgnwoIUVJcicM9jYcvQK18+OeHiXw7uLPSjqWxJIp1EfaZ/RGmEwA==",
+        "dependencies": {
+          "Serilog": "4.0.0"
+        }
+      },
       "Serilog.Extensions.Logging": {
         "type": "Direct",
         "requested": "[9.0.1, )",
@@ -274,6 +292,15 @@
         "resolved": "4.2.0",
         "contentHash": "gmoWVOvKgbME8TYR+gwMf7osROiWAURterc6Rt2dQyX7wtjZYpqFiA/pY6ztjGQKKV62GGCyOcmtP1UKMHgSmA=="
       },
+      "Serilog.Enrichers.Thread": {
+        "type": "Direct",
+        "requested": "[4.0.0, )",
+        "resolved": "4.0.0",
+        "contentHash": "C7BK25a1rhUyr+Tp+1BYcVlBJq7M2VCHlIgnwoIUVJcicM9jYcvQK18+OeHiXw7uLPSjqWxJIp1EfaZ/RGmEwA==",
+        "dependencies": {
+          "Serilog": "4.0.0"
+        }
+      },
       "Serilog.Extensions.Logging": {
         "type": "Direct",
         "requested": "[9.0.1, )",