From 5d2461dde4810700fd0c11934584f651b9d056c8 Mon Sep 17 00:00:00 2001 From: Ivan Maximov Date: Fri, 22 Mar 2024 14:51:23 +0300 Subject: [PATCH] Whitespace formatting --- samples/WebApplicationSample/Program.cs | 2 +- .../Extensions/Hosting/DiagnosticContext.cs | 2 +- .../Hosting/InjectedLoggerSettings.cs | 6 +++--- .../SerilogHostBuilderExtensions.cs | 8 ++++---- .../SerilogServiceCollectionExtensions.cs | 18 +++++++++--------- ...ggerSettingsConfigurationExtensionsTests.cs | 6 +++--- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/samples/WebApplicationSample/Program.cs b/samples/WebApplicationSample/Program.cs index 4cf73b8..7144476 100644 --- a/samples/WebApplicationSample/Program.cs +++ b/samples/WebApplicationSample/Program.cs @@ -12,7 +12,7 @@ public static int Main(string[] args) 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 44462ac..fb9ac66 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 97e37ea..1ab94ef 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 7f0ab0d..3146232 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 e6055c0..88bbc97 100644 --- a/src/Serilog.Extensions.Hosting/SerilogServiceCollectionExtensions.cs +++ b/src/Serilog.Extensions.Hosting/SerilogServiceCollectionExtensions.cs @@ -37,7 +37,7 @@ public RegisteredLogger(ILogger logger) { Logger = logger; } - + public ILogger Logger { get; } } @@ -54,8 +54,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) { @@ -136,7 +136,7 @@ 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. #if !NO_RELOADABLE_LOGGER var reloadable = Log.Logger as ReloadableLogger; @@ -144,13 +144,13 @@ public static IServiceCollection AddSerilog( #else const bool useReload = false; #endif - + LoggerProviderCollection loggerProviders = null; if (writeToProviders) { loggerProviders = new LoggerProviderCollection(); } - + collection.AddSingleton(services => { ILogger logger; @@ -190,11 +190,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) { @@ -219,7 +219,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 54a8154..ce46fb7 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); }