Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added AddNLog-extension-method with custom options and serviceprovider-functor #595

Merged
merged 1 commit into from
Jun 12, 2022
Merged

Added AddNLog-extension-method with custom options and serviceprovider-functor #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions src/NLog.Extensions.Logging/Extensions/ConfigureExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static ILoggerFactory AddNLog(this ILoggerFactory factory)
/// Enable NLog as logging provider for Microsoft Extension Logging
/// </summary>
/// <param name="factory"></param>
/// <param name="options">NLog options</param>
/// <param name="options">NLog Logging Provider options</param>
/// <returns>ILoggerFactory for chaining</returns>
#if !NETCORE1_0
[Obsolete("Instead use ILoggingBuilder.AddNLog() or IHostBuilder.UseNLog()")]
Expand Down Expand Up @@ -89,7 +89,7 @@ public static ILoggingBuilder AddNLog(this ILoggingBuilder factory, IConfigurati
/// </summary>
/// <param name="factory"></param>
/// <param name="configuration">Configuration</param>
/// <param name="options">NLog options</param>
/// <param name="options">NLog Logging Provider options</param>
/// <returns>ILoggingBuilder for chaining</returns>
public static ILoggingBuilder AddNLog(this ILoggingBuilder factory, IConfiguration configuration, NLogProviderOptions options)
{
Expand All @@ -101,7 +101,7 @@ public static ILoggingBuilder AddNLog(this ILoggingBuilder factory, IConfigurati
/// Enable NLog as logging provider for Microsoft Extension Logging
/// </summary>
/// <param name="factory"></param>
/// <param name="options">NLog options</param>
/// <param name="options">NLog Logging Provider options</param>
/// <returns>ILoggingBuilder for chaining</returns>
public static ILoggingBuilder AddNLog(this ILoggingBuilder factory, NLogProviderOptions options)
{
Expand All @@ -125,7 +125,7 @@ public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, LoggingConfi
/// </summary>
/// <param name="builder"></param>
/// <param name="configuration">New NLog config.</param>
/// <param name="options">NLog options</param>
/// <param name="options">NLog Logging Provider options</param>
/// <returns>ILoggingBuilder for chaining</returns>
public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, LoggingConfiguration configuration, NLogProviderOptions options)
{
Expand Down Expand Up @@ -158,6 +158,27 @@ public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, string confi
return builder;
}

/// <summary>
/// Enable NLog as logging provider for Microsoft Extension Logging
/// </summary>
/// <param name="builder"></param>
/// <param name="options">NLog Logging Provider options</param>
/// <param name="factoryBuilder">Initialize NLog LogFactory with NLog LoggingConfiguration.</param>
/// <returns>ILoggingBuilder for chaining</returns>
public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, NLogProviderOptions options, Func<IServiceProvider, LogFactory> factoryBuilder)
{
AddNLogLoggerProvider(builder, null, options, (serviceProvider, config, options) =>
{
serviceProvider.SetupNLogConfigSettings(config);

// Delay initialization of targets until we have loaded config-settings
var logFactory = factoryBuilder(serviceProvider);
var provider = CreateNLogLoggerProvider(serviceProvider, config, options, logFactory);
return provider;
});
return builder;
}

/// <summary>
/// Enable NLog as logging provider for Microsoft Extension Logging
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/NLog.Extensions.Logging/Logging/NLogProviderOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace NLog.Extensions.Logging
{
/// <summary>
/// Options for logging to NLog with
/// Configuration options for the NLog Logging Provider with Microsoft Extension Logging
/// </summary>
public class NLogProviderOptions
{
Expand Down