From 9bca8ce4ddced3f65704c64d384916fe07962a9c Mon Sep 17 00:00:00 2001 From: alsami Date: Mon, 7 Oct 2019 08:43:31 +0200 Subject: [PATCH] fix: initialize logger immediately instead of using the autofac module fixes #1 --- .../ContainerBuilderExtensions.cs | 11 ++++------- .../SerilogModule.cs | 10 ---------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/Serilog.Extensions.Autofac.DependencyInjection/ContainerBuilderExtensions.cs b/src/Serilog.Extensions.Autofac.DependencyInjection/ContainerBuilderExtensions.cs index 118cc58..44b7b62 100644 --- a/src/Serilog.Extensions.Autofac.DependencyInjection/ContainerBuilderExtensions.cs +++ b/src/Serilog.Extensions.Autofac.DependencyInjection/ContainerBuilderExtensions.cs @@ -10,14 +10,10 @@ public static ContainerBuilder RegisterSerilog(this ContainerBuilder builder, st LogEventLevel logEventLevel = LogEventLevel.Debug, string outputTemplate = Constants.DefaultLogTemplate) { if (string.IsNullOrWhiteSpace(logPath)) - { throw new ArgumentNullException(nameof(logPath)); - } if (string.IsNullOrWhiteSpace(outputTemplate)) - { throw new ArgumentNullException(nameof(outputTemplate)); - } return RegisterSerilogInternal(builder, Constants.DefaultLoggerConfiguration(logPath, outputTemplate, logEventLevel)); @@ -30,11 +26,12 @@ private static ContainerBuilder RegisterSerilogInternal(this ContainerBuilder bu LoggerConfiguration loggerConfiguration) { if (loggerConfiguration == null) - { throw new ArgumentNullException(nameof(loggerConfiguration)); - } - builder.RegisterModule(new SerilogModule(loggerConfiguration)); + Log.Logger = loggerConfiguration + .CreateLogger(); + + builder.RegisterModule(); return builder; } diff --git a/src/Serilog.Extensions.Autofac.DependencyInjection/SerilogModule.cs b/src/Serilog.Extensions.Autofac.DependencyInjection/SerilogModule.cs index e93ade5..7337f0d 100644 --- a/src/Serilog.Extensions.Autofac.DependencyInjection/SerilogModule.cs +++ b/src/Serilog.Extensions.Autofac.DependencyInjection/SerilogModule.cs @@ -6,18 +6,8 @@ namespace Serilog.Extensions.Autofac.DependencyInjection { internal class SerilogModule : Module { - private readonly LoggerConfiguration loggerConfiguration; - - public SerilogModule(LoggerConfiguration loggerConfiguration) - { - this.loggerConfiguration = loggerConfiguration; - } - protected override void Load(ContainerBuilder builder) { - Log.Logger = this.loggerConfiguration - .CreateLogger(); - builder.Register(_ => new LoggerFactory(new ILoggerProvider[] {new SerilogLoggerProvider()})) .As() .SingleInstance();