Skip to content

Commit 8b58d90

Browse files
author
Tim Hess
committed
fix a typo, In Serilog setup, catch pre-existing IDynamicLoggerProvider registration
1 parent c971259 commit 8b58d90

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

src/Logging/src/SerilogDynamicLoggerCore/SerilogBuilderExtensions.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ public static class SerilogBuilderExtensions
3737
/// <returns>The configured <see cref="ILoggingBuilder"/></returns>
3838
public static ILoggingBuilder AddSerilogDynamicConsole(this ILoggingBuilder builder)
3939
{
40+
if (builder.Services.Any(sd => sd.ServiceType == typeof(IDynamicLoggerProvider)))
41+
{
42+
throw new InvalidOperationException("An IDynamicLoggerProvider has already been configured! Call 'AddSerilogDynamicConsole' earlier in program.cs (Before AddCloudFoundryActuators()) or remove duplicate IDynamicLoggerProvider entries.");
43+
}
44+
4045
builder.Services.AddSingleton<ISerilogOptions, SerilogOptions>();
4146
builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<ILoggerProvider, SerilogDynamicProvider>());
4247

src/Management/src/TracingCore/Observer/AspNetCoreMvcActionObserver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public override void ProcessEvent(string evnt, object arg)
7373

7474
HandleAfterActionEvent();
7575

76-
Logger?.LogTrace("HandleAfterActionEvent finsih {thread}", Thread.CurrentThread.ManagedThreadId);
76+
Logger?.LogTrace("HandleAfterActionEvent finish {thread}", Thread.CurrentThread.ManagedThreadId);
7777
}
7878
}
7979

src/Management/test/CloudFoundryCore.Test/CloudFoundryHostBuilderExtensionsTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ public void AddCloudFoundryActuators_IHostBuilder_Serilog()
152152
{
153153
// Arrange
154154
var hostBuilder = Host.CreateDefaultBuilder()
155-
.AddCloudFoundryActuators()
156155
.ConfigureLogging(logging => logging.AddSerilogDynamicConsole())
157156
.ConfigureAppConfiguration(cbuilder => cbuilder.AddInMemoryCollection(managementSettings))
158-
.ConfigureWebHost(configureApp => configureApp.UseTestServer());
157+
.ConfigureWebHost(configureApp => configureApp.UseTestServer())
158+
.AddCloudFoundryActuators();
159159

160160
// Act
161161
var host = hostBuilder.Build();

0 commit comments

Comments
 (0)