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

Improve code-coverage by merging similar AddNLog-methods #648

Merged
merged 1 commit into from
Dec 13, 2022
Merged

Improve code-coverage by merging similar AddNLog-methods #648

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
31 changes: 9 additions & 22 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 @@ -71,20 +71,18 @@ public static ILoggerFactory AddNLog(this ILoggerFactory factory, IConfiguration
/// <returns>ILoggingBuilder for chaining</returns>
public static ILoggingBuilder AddNLog(this ILoggingBuilder builder)
{
return builder.AddNLog((NLogProviderOptions)null);
return builder.AddNLog(NLogProviderOptions.Default);
}

/// <summary>
/// Enable NLog as logging provider for Microsoft Extension Logging
/// </summary>
/// <param name="factory"></param>
/// <param name="builder"></param>
/// <param name="configuration">Override configuration and not use default Host Builder Configuration</param>
/// <returns>ILoggingBuilder for chaining</returns>
public static ILoggingBuilder AddNLog(this ILoggingBuilder factory, IConfiguration configuration)
public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, IConfiguration configuration)
{
Guard.ThrowIfNull(factory);
AddNLogLoggerProvider(factory, configuration, null, CreateNLogLoggerProvider);
return factory;
return AddNLog(builder, configuration, null);
}

/// <summary>
Expand Down Expand Up @@ -169,36 +167,25 @@ public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, string confi
/// 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)
public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, Func<IServiceProvider, LogFactory> factoryBuilder)
{
Guard.ThrowIfNull(builder);
Guard.ThrowIfNull(factoryBuilder);
AddNLogLoggerProvider(builder, null, options, (serviceProvider, config, options) =>
{
serviceProvider.SetupNLogConfigSettings(config, LogManager.LogFactory);

// 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;
return AddNLog(builder, null, factoryBuilder);
}

/// <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, Func<IServiceProvider, LogFactory> factoryBuilder)
public static ILoggingBuilder AddNLog(this ILoggingBuilder builder, NLogProviderOptions options, Func<IServiceProvider, LogFactory> factoryBuilder)
{
Guard.ThrowIfNull(builder);
Guard.ThrowIfNull(factoryBuilder);
AddNLogLoggerProvider(builder, null, null, (serviceProvider, config, options) =>
AddNLogLoggerProvider(builder, null, options, (serviceProvider, config, options) =>
{
serviceProvider.SetupNLogConfigSettings(config, LogManager.LogFactory);

Expand Down