Skip to content

Commit

Permalink
Introduced NLogProviderOptions AutoShutdown that is turned off by def…
Browse files Browse the repository at this point in the history
…ault (#606)
  • Loading branch information
snakefoot authored Jul 14, 2022
1 parent c731661 commit 0f34501
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
5 changes: 0 additions & 5 deletions src/NLog.Extensions.Hosting/Extensions/ConfigureExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ private static NLogLoggerProvider CreateNLogLoggerProvider(IServiceProvider serv
TryLoadConfigurationFromContentRootPath(provider.LogFactory, contentRootPath);
}

if (provider.Options.ShutdownOnDispose)
{
provider.LogFactory.AutoShutdown = false;
}

return provider;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ internal static NLogLoggerProvider CreateNLogLoggerProvider(this IServiceProvide
provider.TryLoadConfigurationFromSection(configuration);
}

if (provider.Options.ShutdownOnDispose || !provider.Options.AutoShutdown)
{
provider.LogFactory.AutoShutdown = false;
}

return provider;
}

Expand Down
5 changes: 5 additions & 0 deletions src/NLog.Extensions.Logging/Logging/NLogProviderOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ public class NLogProviderOptions
/// </summary>
public bool ShutdownOnDispose { get; set; }

/// <summary>
/// Automatically Shutdown NLog on AppDomain.Unload or AppDomain.ProcessExit
/// </summary>
public bool AutoShutdown { get; set; }

#if NET5_0
/// <summary>
/// Automatically include <see cref="System.Diagnostics.Activity.SpanId"/>, <see cref="System.Diagnostics.Activity.TraceId"/> and <see cref="System.Diagnostics.Activity.ParentId"/>
Expand Down

0 comments on commit 0f34501

Please sign in to comment.