diff --git a/samples/WebApplicationSample/Program.cs b/samples/WebApplicationSample/Program.cs index e6fa7e6..a6c7b6a 100644 --- a/samples/WebApplicationSample/Program.cs +++ b/samples/WebApplicationSample/Program.cs @@ -9,7 +9,7 @@ Log.Logger = new LoggerConfiguration() .WriteTo.Console() .CreateBootstrapLogger(); - + Log.Information("Starting up!"); try diff --git a/src/Serilog.Extensions.Hosting/Extensions/Hosting/DiagnosticContext.cs b/src/Serilog.Extensions.Hosting/Extensions/Hosting/DiagnosticContext.cs index 62fce9f..af9b99f 100644 --- a/src/Serilog.Extensions.Hosting/Extensions/Hosting/DiagnosticContext.cs +++ b/src/Serilog.Extensions.Hosting/Extensions/Hosting/DiagnosticContext.cs @@ -50,7 +50,7 @@ public void Set(string propertyName, object value, bool destructureObjects = fal if (propertyName == null) throw new ArgumentNullException(nameof(propertyName)); var collector = AmbientDiagnosticContextCollector.Current; - if (collector != null && + if (collector != null && (_logger ?? Log.Logger).BindProperty(propertyName, value, destructureObjects, out var property)) { collector.AddOrUpdate(property); diff --git a/src/Serilog.Extensions.Hosting/Extensions/Hosting/InjectedLoggerSettings.cs b/src/Serilog.Extensions.Hosting/Extensions/Hosting/InjectedLoggerSettings.cs index d879bf8..f190089 100644 --- a/src/Serilog.Extensions.Hosting/Extensions/Hosting/InjectedLoggerSettings.cs +++ b/src/Serilog.Extensions.Hosting/Extensions/Hosting/InjectedLoggerSettings.cs @@ -19,7 +19,7 @@ public void Configure(LoggerConfiguration loggerConfiguration) var levelSwitch = _services.GetService(); if (levelSwitch != null) loggerConfiguration.MinimumLevel.ControlledBy(levelSwitch); - + foreach (var settings in _services.GetServices()) loggerConfiguration.ReadFrom.Settings(settings); @@ -28,10 +28,10 @@ public void Configure(LoggerConfiguration loggerConfiguration) foreach (var enricher in _services.GetServices()) loggerConfiguration.Enrich.With(enricher); - + foreach (var filter in _services.GetServices()) loggerConfiguration.Filter.With(filter); - + foreach (var sink in _services.GetServices()) loggerConfiguration.WriteTo.Sink(sink); } diff --git a/src/Serilog.Extensions.Hosting/SerilogHostBuilderExtensions.cs b/src/Serilog.Extensions.Hosting/SerilogHostBuilderExtensions.cs index f777880..b30c340 100644 --- a/src/Serilog.Extensions.Hosting/SerilogHostBuilderExtensions.cs +++ b/src/Serilog.Extensions.Hosting/SerilogHostBuilderExtensions.cs @@ -38,8 +38,8 @@ public static class SerilogHostBuilderExtensions /// default, only Serilog sinks will receive events. /// The host builder. public static IHostBuilder UseSerilog( - this IHostBuilder builder, - ILogger? logger = null, + this IHostBuilder builder, + ILogger? logger = null, bool dispose = false, LoggerProviderCollection? providers = null) { @@ -105,7 +105,7 @@ public static IHostBuilder UseSerilog( { if (builder == null) throw new ArgumentNullException(nameof(builder)); if (configureLogger == null) throw new ArgumentNullException(nameof(configureLogger)); - + builder.ConfigureServices((context, collection) => { collection.AddSerilog( @@ -114,7 +114,7 @@ public static IHostBuilder UseSerilog( preserveStaticLogger: preserveStaticLogger, writeToProviders: writeToProviders); }); - + return builder; } } diff --git a/src/Serilog.Extensions.Hosting/SerilogServiceCollectionExtensions.cs b/src/Serilog.Extensions.Hosting/SerilogServiceCollectionExtensions.cs index 9e9591b..cdc7e35 100644 --- a/src/Serilog.Extensions.Hosting/SerilogServiceCollectionExtensions.cs +++ b/src/Serilog.Extensions.Hosting/SerilogServiceCollectionExtensions.cs @@ -35,7 +35,7 @@ public RegisteredLogger(ILogger logger) { Logger = logger; } - + public ILogger Logger { get; } } @@ -52,8 +52,8 @@ public RegisteredLogger(ILogger logger) /// default, only Serilog sinks will receive events. /// The service collection. public static IServiceCollection AddSerilog( - this IServiceCollection collection, - ILogger? logger = null, + this IServiceCollection collection, + ILogger? logger = null, bool dispose = false, LoggerProviderCollection? providers = null) { @@ -134,17 +134,17 @@ public static IServiceCollection AddSerilog( { if (collection == null) throw new ArgumentNullException(nameof(collection)); if (configureLogger == null) throw new ArgumentNullException(nameof(configureLogger)); - + // This check is eager; replacing the bootstrap logger after calling this method is not supported. var reloadable = Log.Logger as ReloadableLogger; var useReload = reloadable != null && !preserveStaticLogger; - + LoggerProviderCollection? loggerProviders = null; if (writeToProviders) { loggerProviders = new LoggerProviderCollection(); } - + collection.AddSingleton(services => { ILogger logger; @@ -182,11 +182,11 @@ public static IServiceCollection AddSerilog( var logger = services.GetRequiredService().Logger; return logger.ForContext(new NullEnricher()); }); - + collection.AddSingleton(services => { var logger = services.GetRequiredService().Logger; - + ILogger? registeredLogger = null; if (preserveStaticLogger) { @@ -211,7 +211,7 @@ public static IServiceCollection AddSerilog( }); ConfigureDiagnosticContext(collection, preserveStaticLogger); - + return collection; } diff --git a/test/Serilog.Extensions.Hosting.Tests/LoggerSettingsConfigurationExtensionsTests.cs b/test/Serilog.Extensions.Hosting.Tests/LoggerSettingsConfigurationExtensionsTests.cs index 87f5bea..70f6ab8 100644 --- a/test/Serilog.Extensions.Hosting.Tests/LoggerSettingsConfigurationExtensionsTests.cs +++ b/test/Serilog.Extensions.Hosting.Tests/LoggerSettingsConfigurationExtensionsTests.cs @@ -13,7 +13,7 @@ public class LoggerSettingsConfigurationExtensionsTests public void SinksAreInjectedFromTheServiceProvider() { var emittedEvents = new List(); - + var serviceCollection = new ServiceCollection(); serviceCollection.AddSingleton(new ListSink(emittedEvents)); using var services = serviceCollection.BuildServiceProvider(); @@ -21,9 +21,9 @@ public void SinksAreInjectedFromTheServiceProvider() using var logger = new LoggerConfiguration() .ReadFrom.Services(services) .CreateLogger(); - + logger.Information("Hello, world!"); - + var evt = Assert.Single(emittedEvents); Assert.Equal("Hello, world!", evt!.MessageTemplate.Text); }