Adjusted NLog#412 by renaming LoadNLogConfigFromSection to LoadLoadCo…

…nfigurationFromSection
snakefoot · May 10, 2020 · f856768 · f856768
1 parent 4bd3bcb
commit f856768
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/examples/NetCore2/ConsoleExampleJsonConfig/Program.cs b/examples/NetCore2/ConsoleExampleJsonConfig/Program.cs
@@ -22,7 +22,7 @@ private static void Main()
 
                 LogManager.Setup()
                     .SetupExtensions(s => s.AutoLoadAssemblies(false))
-                    .LoadNLogConfigFromSection(config);
+                    .LoadConfigurationFromSection(config);
 
                 var servicesProvider = BuildDi(config);
                 using (servicesProvider as IDisposable)

diff --git a/src/NLog.Extensions.Logging/Config/SetupBuilderExtensions.cs b/src/NLog.Extensions.Logging/Config/SetupBuilderExtensions.cs
@@ -11,13 +11,16 @@ public static class SetupBuilderExtensions
         /// <summary>
         /// Loads NLog LoggingConfiguration from appsettings.json from NLog-section
         /// </summary>
-        public static ISetupBuilder LoadNLogConfigFromSection(this ISetupBuilder setupBuilder, Microsoft.Extensions.Configuration.IConfiguration configuration)
+        public static ISetupBuilder LoadConfigurationFromSection(this ISetupBuilder setupBuilder, Microsoft.Extensions.Configuration.IConfiguration configuration, string configSection = "NLog")
         {
             setupBuilder.SetupExtensions(s => s.RegisterConfigSettings(configuration));
-            var nlogConfig = configuration.GetSection("NLog");
-            if (nlogConfig != null && nlogConfig.GetChildren().Any())
+            if (!string.IsNullOrEmpty(configSection))
             {
-                setupBuilder.LogFactory.Configuration = new NLogLoggingConfiguration(nlogConfig, setupBuilder.LogFactory);
+                var nlogConfig = configuration.GetSection(configSection);
+                if (nlogConfig != null && nlogConfig.GetChildren().Any())
+                {
+                    setupBuilder.LogFactory.Configuration = new NLogLoggingConfiguration(nlogConfig, setupBuilder.LogFactory);
+                }
             }
             return setupBuilder;
         }

diff --git a/test/NLog.Extensions.Logging.Tests/NLogLoggingConfigurationTests.cs b/test/NLog.Extensions.Logging.Tests/NLogLoggingConfigurationTests.cs
@@ -171,7 +171,7 @@ public void ReloadLogFactoryConfigurationKeepVariables()
         }
 
         [Fact]
-        public void SetupBuilderNLogLoggingConfiguration()
+        public void SetupBuilderLoadConfigurationFromSection()
         {
             var memoryConfig = CreateMemoryConfigConsoleTargetAndRule();
             memoryConfig["NLog:Targets:file:type"] = "File";
@@ -181,7 +181,7 @@ public void SetupBuilderNLogLoggingConfiguration()
             var logFactory = new LogFactory();
             logFactory.Setup()
                 .SetupExtensions(s => s.AutoLoadAssemblies(false))
-                .LoadNLogConfigFromSection(configuration);
+                .LoadConfigurationFromSection(configuration);
 
             Assert.Single(logFactory.Configuration.LoggingRules);
             Assert.Equal(2, logFactory.Configuration.LoggingRules[0].Targets.Count);