Skip to content

Commit 2e89813

Browse files
committed
Add more logs
1 parent c507d65 commit 2e89813

File tree

4 files changed

+134
-28
lines changed

4 files changed

+134
-28
lines changed

src/EasySign.Cli/BundleCommandProvider.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ namespace SAPTeam.EasySign.Cli
1313
{
1414
internal class BundleCommandProvider : CommandProvider<Bundle>
1515
{
16-
ILogger _logger;
16+
ILogger _bundleLogger;
1717

18-
public BundleCommandProvider(ILogger logger)
18+
public BundleCommandProvider(ILogger logger, ILogger bundleLogger)
1919
{
20-
_logger = logger;
20+
Logger = logger;
21+
_bundleLogger = bundleLogger;
2122
}
2223

2324
public override void InitializeBundle(string bundlePath)
2425
{
25-
Program.Logger.Information("Initializing bundle at {bundlePath}", bundlePath);
26-
Bundle = new Bundle(bundlePath, _logger);
26+
Logger.LogInformation("Initializing bundle at {bundlePath}", bundlePath);
27+
Bundle = new Bundle(bundlePath, _bundleLogger);
2728
}
2829

2930
public override RootCommand GetRootCommand()

src/EasySign.Cli/Program.cs

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Microsoft.Extensions.Logging;
1010

1111
using Serilog;
12+
using Serilog.Extensions.Logging;
1213

1314
using Spectre.Console;
1415

@@ -30,22 +31,16 @@ static int Main(string[] args)
3031
.MinimumLevel.Debug() // Minimum log level
3132
.CreateLogger();
3233

33-
var serviceCollection = new ServiceCollection();
34-
serviceCollection.AddLogging(configure =>
35-
{
36-
configure.ClearProviders(); // Clear default providers
37-
configure.AddSerilog(Log.Logger.ForContext("Context", "Bundle"));
38-
});
39-
40-
var serviceProvider = serviceCollection.BuildServiceProvider();
41-
42-
// Resolve an ILogger instance
43-
var bundleLogger = serviceProvider.GetRequiredService<ILogger<Bundle>>();
44-
4534
Logger = Log.Logger.ForContext("Context", "Main");
4635
Logger.Information("Starting EasySign CLI at {DateTime}", DateTime.Now);
4736

48-
var root = new BundleCommandProvider(bundleLogger).GetRootCommand();
37+
var bundleLogger = new SerilogLoggerFactory(Log.Logger.ForContext("Context", "Bundle"))
38+
.CreateLogger("CommandProvider");
39+
40+
var commandProviderLogger = new SerilogLoggerFactory(Log.Logger.ForContext("Context", "CommandProvider"))
41+
.CreateLogger("CommandProvider");
42+
43+
var root = new BundleCommandProvider(commandProviderLogger, bundleLogger).GetRootCommand();
4944
var exitCode = root.Invoke(args);
5045

5146
Logger.Information("Shutting down EasySign CLI at {DateTime} with exit code {ExitCode}", DateTime.Now, exitCode);

0 commit comments

Comments
 (0)