LoadConfigurationFromSection should RegisterConfigSettings without co…

…nfiguration assign (NLog#627)
snakefoot · Oct 27, 2022 · 21fe0da · 21fe0da
1 parent e836eac
commit 21fe0da
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/src/NLog.Extensions.Logging/Config/SetupBuilderExtensions.cs b/src/NLog.Extensions.Logging/Config/SetupBuilderExtensions.cs
@@ -13,7 +13,7 @@ public static class SetupBuilderExtensions
         /// </summary>
         public static ISetupBuilder LoadConfigurationFromSection(this ISetupBuilder setupBuilder, Microsoft.Extensions.Configuration.IConfiguration configuration, string configSection = "NLog")
         {
-            setupBuilder.SetupExtensions(ext => ext.RegisterExtensionsLogging(configuration));
+            setupBuilder.SetupExtensions(ext => ext.RegisterConfigSettings(ConfigSettingLayoutRenderer.DefaultConfiguration ?? configuration));
             if (!string.IsNullOrEmpty(configSection))
             {
                 var nlogConfig = configuration.GetSection(configSection);

diff --git a/src/NLog.Extensions.Logging/Config/SetupExtensionsBuilderExtensions.cs b/src/NLog.Extensions.Logging/Config/SetupExtensionsBuilderExtensions.cs
@@ -13,17 +13,10 @@ public static class SetupExtensionsBuilderExtensions
         /// </summary>
         public static ISetupExtensionsBuilder RegisterConfigSettings(this ISetupExtensionsBuilder setupBuilder, IConfiguration configuration)
         {
-            ConfigSettingLayoutRenderer.DefaultConfiguration = configuration;
-            return setupBuilder.RegisterExtensionsLogging(configuration);
-        }
-
-        internal static ISetupExtensionsBuilder RegisterExtensionsLogging(this ISetupExtensionsBuilder setupBuilder, IConfiguration configuration)
-        {
-            if (ConfigSettingLayoutRenderer.DefaultConfiguration is null)
-            {
-                ConfigSettingLayoutRenderer.DefaultConfiguration = configuration;
-            }
-            return setupBuilder.RegisterLayoutRenderer<ConfigSettingLayoutRenderer>("configsetting").RegisterLayoutRenderer<MicrosoftConsoleLayoutRenderer>("MicrosoftConsoleLayout").RegisterLayout<MicrosoftConsoleJsonLayout>("MicrosoftConsoleJsonLayout");
+            ConfigSettingLayoutRenderer.DefaultConfiguration = configuration ?? ConfigSettingLayoutRenderer.DefaultConfiguration;
+            return setupBuilder.RegisterLayoutRenderer<ConfigSettingLayoutRenderer>("configsetting")
+                               .RegisterLayoutRenderer<MicrosoftConsoleLayoutRenderer>("MicrosoftConsoleLayout")
+                               .RegisterLayout<MicrosoftConsoleJsonLayout>("MicrosoftConsoleJsonLayout");
         }
     }
 }
diff --git a/src/NLog.Extensions.Logging/Internal/RegisterNLogLoggingProvider.cs b/src/NLog.Extensions.Logging/Internal/RegisterNLogLoggingProvider.cs
@@ -90,7 +90,7 @@ internal static NLogLoggerProvider CreateNLogLoggerProvider(this IServiceProvide
 
         internal static IConfiguration SetupNLogConfigSettings(this IServiceProvider serviceProvider, IConfiguration configuration, LogFactory logFactory)
         {
-            configuration = configuration ?? (serviceProvider?.GetService(typeof(IConfiguration)) as IConfiguration) ?? ConfigSettingLayoutRenderer.DefaultConfiguration;
+            configuration = configuration ?? (serviceProvider?.GetService(typeof(IConfiguration)) as IConfiguration);
             logFactory.Setup().SetupExtensions(ext => ext.RegisterConfigSettings(configuration));
             return configuration;
         }