Support TargetDefaultWrapper and TargetDefaultParameters (#500)

snakefoot · web-flow · commit a693ce146546 · 2021-04-28T23:56:34.000+02:00
diff --git a/src/NLog.Extensions.Logging/Config/NLogLoggingConfiguration.cs b/src/NLog.Extensions.Logging/Config/NLogLoggingConfiguration.cs
@@ -65,7 +65,7 @@ public override LoggingConfiguration Reload()
 
         private bool LoadConfigurationSection(IConfigurationSection nlogConfig)
         {
-            var configElement = new LoggingConfigurationElement(nlogConfig, true, RootSectionKey);
+            var configElement = new LoggingConfigurationElement(nlogConfig, RootSectionKey);
             LoadConfig(configElement, null);
             return configElement.AutoReload;
         }
@@ -131,20 +131,22 @@ private class LoggingConfigurationElement : ILoggingConfigurationElement
             private const string TargetKey = "target";
             private const string TargetsKey = "targets";
             private const string DefaultTargetParameters = "Default-target-parameters";
+            private const string TargetDefaultParameters = "TargetDefaultParameters";
             private const string VariableKey = "Variable";
             private const string DefaultWrapper = "Default-wrapper";
+            private const string TargetDefaultWrapper = "TargetDefaultWrapper";
             private readonly IConfigurationSection _configurationSection;
-            private IConfigurationSection DefaultTargetParametersSection { get; set; }
-            private IConfigurationSection DefaultTargetWrapperSection { get; set; }
+            private IConfigurationSection TargetDefaultParametersSection { get; set; }
+            private IConfigurationSection TargetDefaultWrapperSection { get; set; }
             private readonly string _nameOverride;
             private readonly bool _topElement;
 
-            public LoggingConfigurationElement(IConfigurationSection configurationSection, bool topElement, string nameOverride = null)
+            public LoggingConfigurationElement(IConfigurationSection configurationSection, string nameOverride = null)
             {
                 _configurationSection = configurationSection;
                 _nameOverride = nameOverride;
-                _topElement = topElement;
-                if (topElement && bool.TryParse(configurationSection["autoreload"], out var autoReload))
+                _topElement = ReferenceEquals(nameOverride, RootSectionKey);
+                if (_topElement && bool.TryParse(configurationSection["autoreload"], out var autoReload))
                 {
                     AutoReload = autoReload;
                 }
@@ -192,7 +194,7 @@ private IEnumerable<ILoggingConfigurationElement> GetChildren()
                 {
                     foreach (var variable in variables.GetChildren())
                     {
-                        yield return new LoggingConfigurationElement(variable, false, VariableKey);
+                        yield return new LoggingConfigurationElement(variable, VariableKey);
                     }
                 }
 
@@ -214,11 +216,11 @@ private IEnumerable<ILoggingConfigurationElement> GetChildren()
 
             private IEnumerable<ILoggingConfigurationElement> GetChildren(IEnumerable<IConfigurationSection> children, IConfigurationSection variables, bool isTargetsSection)
             {
-                var defaultTargetWrapper = GetDefaultWrapperSection();
-                var defaultTargetParameters = GetDefaultTargetParametersSection();
+                var targetDefaultWrapper = GetTargetDefaultWrapperSection();
+                var targetDefaultParameters = GetTargetDefaultParametersSection();
                 foreach (var child in children)
                 {
-                    if (AlreadyReadChild(child, variables, defaultTargetWrapper, defaultTargetParameters))
+                    if (AlreadyReadChild(child, variables, targetDefaultWrapper, targetDefaultParameters))
                     {
                         continue;
                     }
@@ -231,34 +233,23 @@ private IEnumerable<ILoggingConfigurationElement> GetChildren(IEnumerable<IConfi
 
                     if (IsTargetWithinWrapper(child))
                     {
-                        yield return new LoggingConfigurationElement(firstChildValue, false, TargetKey);
+                        yield return new LoggingConfigurationElement(firstChildValue, TargetKey);
+                    }
+                    else if (_topElement && GetConfigKey(child).EqualsOrdinalIgnoreCase(TargetsKey))
+                    {
+                        yield return new LoggingConfigurationElement(child)
+                        {
+                            TargetDefaultParametersSection = targetDefaultParameters,
+                            TargetDefaultWrapperSection = targetDefaultWrapper,
+                        };
                     }
                     else
                     {
-                        yield return CreateLoggingConfigurationElement(isTargetsSection, child, defaultTargetParameters, defaultTargetWrapper);
+                        yield return new LoggingConfigurationElement(child, isTargetsSection ? TargetKey : null);
                     }
                 }
             }
 
-            private static LoggingConfigurationElement CreateLoggingConfigurationElement(bool isTargetsSection, IConfigurationSection child, IConfigurationSection defaultTargetParameters, IConfigurationSection defaultTargetWrapper)
-            {
-                IConfigurationSection defaultTargetParametersSection = null;
-                IConfigurationSection defaultTargetWrapperSection = null;
-
-                if (defaultTargetParameters != null || defaultTargetWrapper != null)
-                {
-                    var isTargetsKey = GetConfigKey(child).EqualsOrdinalIgnoreCase(TargetsKey);
-                    defaultTargetParametersSection = defaultTargetParameters != null && isTargetsKey ? defaultTargetParameters : null;
-                    defaultTargetWrapperSection = defaultTargetWrapper != null && isTargetsKey ? defaultTargetWrapper : null;
-                }
-
-                return new LoggingConfigurationElement(child, false, isTargetsSection ? TargetKey : null)
-                {
-                    DefaultTargetParametersSection = defaultTargetParametersSection,
-                    DefaultTargetWrapperSection = defaultTargetWrapperSection,
-                };
-            }
-
             private static string GetConfigKey(IConfigurationSection child)
             {
                 return child.Key?.Trim() ?? string.Empty;
@@ -272,28 +263,26 @@ private bool IsTargetsSection()
             /// <summary>
             /// Target-config inside Wrapper-Target
             /// </summary>
-            /// <param name="child"></param>
-            /// <returns></returns>
             private bool IsTargetWithinWrapper(IConfigurationSection child)
             {
                 return _nameOverride == TargetKey && GetConfigKey(child).EqualsOrdinalIgnoreCase(TargetKey) && child.GetChildren().Count() == 1;
             }
 
             private IEnumerable<LoggingConfigurationElement> GetTargetsDefaultConfigElements()
             {
-                if (DefaultTargetWrapperSection != null)
-                    yield return new LoggingConfigurationElement(DefaultTargetWrapperSection, true, DefaultWrapper);
+                if (TargetDefaultWrapperSection != null)
+                    yield return new LoggingConfigurationElement(TargetDefaultWrapperSection, DefaultWrapper);
 
-                if (DefaultTargetParametersSection != null)
+                if (TargetDefaultParametersSection != null)
                 {
-                    foreach (var targetParameters in DefaultTargetParametersSection.GetChildren())
+                    foreach (var targetParameters in TargetDefaultParametersSection.GetChildren())
                     {
-                        yield return new LoggingConfigurationElement(targetParameters, true, DefaultTargetParameters);
+                        yield return new LoggingConfigurationElement(targetParameters, DefaultTargetParameters);
                     }
                 }
             }
 
-            private bool AlreadyReadChild(IConfigurationSection child, IConfigurationSection variables, IConfigurationSection defaultWrapper, IConfigurationSection defaultTargetParameters)
+            private bool AlreadyReadChild(IConfigurationSection child, IConfigurationSection variables, IConfigurationSection targetDefaultWrapper, IConfigurationSection targetDefaultParameters)
             {
                 if (_topElement)
                 {
@@ -302,12 +291,12 @@ private bool AlreadyReadChild(IConfigurationSection child, IConfigurationSection
                         return true;
                     }
 
-                    if (defaultWrapper != null && child.Key.EqualsOrdinalIgnoreCase(defaultWrapper.Key))
+                    if (targetDefaultWrapper != null && child.Key.EqualsOrdinalIgnoreCase(targetDefaultWrapper.Key))
                     {
                         return true;
                     }
 
-                    if (defaultTargetParameters != null && child.Key.EqualsOrdinalIgnoreCase(defaultTargetParameters.Key))
+                    if (targetDefaultParameters != null && child.Key.EqualsOrdinalIgnoreCase(targetDefaultParameters.Key))
                     {
                         return true;
                     }
@@ -322,27 +311,50 @@ private IConfigurationSection GetVariablesSection()
                 return variables;
             }
 
-            private IConfigurationSection GetDefaultTargetParametersSection()
+            private IConfigurationSection GetTargetDefaultParametersSection()
             {
-                var defaultTargetParameters = _topElement ? _configurationSection.GetSection(DefaultTargetParameters) : null;
-                if (defaultTargetParameters != null && defaultTargetParameters.GetChildren().Any())
+                if (_topElement)
                 {
-                    return defaultTargetParameters;
+                    var targetDefaultParameters = _configurationSection.GetSection(TargetDefaultParameters);
+                    if (targetDefaultParameters?.GetChildren().Any() == true)
+                    {
+                        return targetDefaultParameters;
+                    }
+
+                    targetDefaultParameters = _configurationSection.GetSection(DefaultTargetParameters);
+                    if (targetDefaultParameters?.GetChildren().Any() == true)
+                    {
+                        return targetDefaultParameters;
+                    }
                 }
 
                 return null;
             }
 
-            private IConfigurationSection GetDefaultWrapperSection()
+            private IConfigurationSection GetTargetDefaultWrapperSection()
             {
-                var defaultWrapper = _topElement ? _configurationSection.GetSection(DefaultWrapper) : null;
-                if (defaultWrapper != null && defaultWrapper.GetChildren().Any())
+                if (_topElement)
                 {
-                    return defaultWrapper;
+                    var targetDefaultWrapper = _configurationSection.GetSection(TargetDefaultWrapper);
+                    if (targetDefaultWrapper?.GetChildren().Any() == true)
+                    {
+                        return targetDefaultWrapper;
+                    }
+
+                    targetDefaultWrapper = _configurationSection.GetSection(DefaultWrapper);
+                    if (targetDefaultWrapper?.GetChildren().Any() == true)
+                    {
+                        return targetDefaultWrapper;
+                    }
                 }
 
                 return null;
             }
+
+            public override string ToString()
+            {
+                return Name;
+            }
         }
     }
 }
diff --git a/src/NLog.Extensions.Logging/Config/SetupBuilderExtensions.cs b/src/NLog.Extensions.Logging/Config/SetupBuilderExtensions.cs
@@ -17,7 +17,7 @@ public static ISetupBuilder LoadConfigurationFromSection(this ISetupBuilder setu
             if (!string.IsNullOrEmpty(configSection))
             {
                 var nlogConfig = configuration.GetSection(configSection);
-                if (nlogConfig != null && nlogConfig.GetChildren().Any())
+                if (nlogConfig?.GetChildren().Any() == true)
                 {
                     setupBuilder.LogFactory.Configuration = new NLogLoggingConfiguration(nlogConfig, setupBuilder.LogFactory);
                 }
diff --git a/test/NLog.Extensions.Logging.Tests/NLogLoggingConfigurationTests.cs b/test/NLog.Extensions.Logging.Tests/NLogLoggingConfigurationTests.cs
@@ -121,6 +121,25 @@ public void LoadDefaultWrapperConfig()
             Assert.Equal("hello.txt", ((logConfig.FindTargetByName("file") as AsyncTargetWrapper)?.WrappedTarget as FileTarget)?.FileName.Render(LogEventInfo.CreateNullEvent()));
         }
 
+        [Fact]
+        public void LoadTargetDefaultWrapperConfig()
+        {
+            var memoryConfig = CreateMemoryConfigConsoleTargetAndRule();
+            memoryConfig["NLog:Targets:file:type"] = "File";
+            memoryConfig["NLog:Targets:file:fileName"] = "hello.txt";
+            memoryConfig["NLog:TargetDefaultWrapper:type"] = "AsyncWrapper";
+            memoryConfig["NLog:TargetDefaultWrapper:batchSize"] = "1";
+
+            var logConfig = CreateNLogLoggingConfigurationWithNLogSection(memoryConfig);
+
+            Assert.Single(logConfig.LoggingRules);
+            Assert.Equal(2, logConfig.LoggingRules[0].Targets.Count);
+            Assert.Equal(2, (logConfig.AllTargets.Count(t => t is AsyncTargetWrapper asyncTarget && asyncTarget.BatchSize == 1)));
+            Assert.Single(logConfig.AllTargets.Where(t => t is AsyncTargetWrapper asyncTarget && asyncTarget.WrappedTarget is FileTarget));
+            Assert.Single(logConfig.AllTargets.Where(t => t is AsyncTargetWrapper asyncTarget && asyncTarget.WrappedTarget is ConsoleTarget));
+            Assert.Equal("hello.txt", ((logConfig.FindTargetByName("file") as AsyncTargetWrapper)?.WrappedTarget as FileTarget)?.FileName.Render(LogEventInfo.CreateNullEvent()));
+        }
+
         [Fact]
         public void LoadDefaultTargetParametersConfig()
         {
@@ -140,19 +159,38 @@ public void LoadDefaultTargetParametersConfig()
             Assert.True((logConfig.FindTargetByName("console") as ConsoleTarget)?.Error);
         }
 
+        [Fact]
+        public void LoadTargetDefaultParametersConfig()
+        {
+            var memoryConfig = CreateMemoryConfigConsoleTargetAndRule();
+            memoryConfig["NLog:Targets:file:type"] = "File";
+            memoryConfig["NLog:TargetDefaultParameters:file:filename"] = "hello.txt";
+            memoryConfig["NLog:TargetDefaultParameters:console:error"] = "true";
+
+            var logConfig = CreateNLogLoggingConfigurationWithNLogSection(memoryConfig);
+
+            Assert.Single(logConfig.LoggingRules);
+            Assert.Equal(2, logConfig.LoggingRules[0].Targets.Count);
+            Assert.Equal(2, logConfig.AllTargets.Count);
+            Assert.Single(logConfig.AllTargets.Where(t => t is FileTarget));
+            Assert.Single(logConfig.AllTargets.Where(t => t is ConsoleTarget));
+            Assert.Equal("hello.txt", (logConfig.FindTargetByName("file") as FileTarget)?.FileName?.Render(LogEventInfo.CreateNullEvent()));
+            Assert.True((logConfig.FindTargetByName("console") as ConsoleTarget)?.Error);
+        }
+
         [Fact]
         public void LoadDefaultTargetParametersJsonLayoutConfig()
         {
             var memoryConfig = CreateMemoryConfigConsoleTargetAndRule();
             memoryConfig["NLog:Targets:file:type"] = "File";
-            memoryConfig["NLog:default-target-parameters:file:filename"] = "hello.txt";
-            memoryConfig["NLog:default-target-parameters:file:layout:type"] = "JsonLayout";
-            memoryConfig["NLog:default-target-parameters:file:layout:Attributes:0:name"] = "timestamp";
-            memoryConfig["NLog:default-target-parameters:file:layout:Attributes:0:layout"] = "${date:format=o}";
-            memoryConfig["NLog:default-target-parameters:file:layout:Attributes:1:name"] = "level";
-            memoryConfig["NLog:default-target-parameters:file:layout:Attributes:1:layout"] = "${level}";
-            memoryConfig["NLog:default-target-parameters:file:layout:Attributes:2:name"] = "message";
-            memoryConfig["NLog:default-target-parameters:file:layout:Attributes:2:layout"] = "${message}";
+            memoryConfig["NLog:TargetDefaultParameters:file:filename"] = "hello.txt";
+            memoryConfig["NLog:TargetDefaultParameters:file:layout:type"] = "JsonLayout";
+            memoryConfig["NLog:TargetDefaultParameters:file:layout:Attributes:0:name"] = "timestamp";
+            memoryConfig["NLog:TargetDefaultParameters:file:layout:Attributes:0:layout"] = "${date:format=o}";
+            memoryConfig["NLog:TargetDefaultParameters:file:layout:Attributes:1:name"] = "level";
+            memoryConfig["NLog:TargetDefaultParameters:file:layout:Attributes:1:layout"] = "${level}";
+            memoryConfig["NLog:TargetDefaultParameters:file:layout:Attributes:2:name"] = "message";
+            memoryConfig["NLog:TargetDefaultParameters:file:layout:Attributes:2:layout"] = "${message}";
 
             var logConfig = CreateNLogLoggingConfigurationWithNLogSection(memoryConfig);
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public override LoggingConfiguration Reload()`
`65`	`65`
`66`	`66`	`private bool LoadConfigurationSection(IConfigurationSection nlogConfig)`
`67`	`67`	`{`
`68`		`- var configElement = new LoggingConfigurationElement(nlogConfig, true, RootSectionKey);`
	`68`	`+ var configElement = new LoggingConfigurationElement(nlogConfig, RootSectionKey);`
`69`	`69`	`LoadConfig(configElement, null);`
`70`	`70`	`return configElement.AutoReload;`
`71`	`71`	`}`
`@@ -131,20 +131,22 @@ private class LoggingConfigurationElement : ILoggingConfigurationElement`
`131`	`131`	`private const string TargetKey = "target";`
`132`	`132`	`private const string TargetsKey = "targets";`
`133`	`133`	`private const string DefaultTargetParameters = "Default-target-parameters";`
	`134`	`+ private const string TargetDefaultParameters = "TargetDefaultParameters";`
`134`	`135`	`private const string VariableKey = "Variable";`
`135`	`136`	`private const string DefaultWrapper = "Default-wrapper";`
	`137`	`+ private const string TargetDefaultWrapper = "TargetDefaultWrapper";`
`136`	`138`	`private readonly IConfigurationSection _configurationSection;`
`137`		`- private IConfigurationSection DefaultTargetParametersSection { get; set; }`
`138`		`- private IConfigurationSection DefaultTargetWrapperSection { get; set; }`
	`139`	`+ private IConfigurationSection TargetDefaultParametersSection { get; set; }`
	`140`	`+ private IConfigurationSection TargetDefaultWrapperSection { get; set; }`
`139`	`141`	`private readonly string _nameOverride;`
`140`	`142`	`private readonly bool _topElement;`
`141`	`143`
`142`		`- public LoggingConfigurationElement(IConfigurationSection configurationSection, bool topElement, string nameOverride = null)`
	`144`	`+ public LoggingConfigurationElement(IConfigurationSection configurationSection, string nameOverride = null)`
`143`	`145`	`{`
`144`	`146`	`_configurationSection = configurationSection;`
`145`	`147`	`_nameOverride = nameOverride;`
`146`		`- _topElement = topElement;`
`147`		`- if (topElement && bool.TryParse(configurationSection["autoreload"], out var autoReload))`
	`148`	`+ _topElement = ReferenceEquals(nameOverride, RootSectionKey);`
	`149`	`+ if (_topElement && bool.TryParse(configurationSection["autoreload"], out var autoReload))`
`148`	`150`	`{`
`149`	`151`	`AutoReload = autoReload;`
`150`	`152`	`}`
`@@ -192,7 +194,7 @@ private IEnumerable<ILoggingConfigurationElement> GetChildren()`
`192`	`194`	`{`
`193`	`195`	`foreach (var variable in variables.GetChildren())`
`194`	`196`	`{`
`195`		`- yield return new LoggingConfigurationElement(variable, false, VariableKey);`
	`197`	`+ yield return new LoggingConfigurationElement(variable, VariableKey);`
`196`	`198`	`}`
`197`	`199`	`}`
`198`	`200`
`@@ -214,11 +216,11 @@ private IEnumerable<ILoggingConfigurationElement> GetChildren()`
`214`	`216`
`215`	`217`	`private IEnumerable<ILoggingConfigurationElement> GetChildren(IEnumerable<IConfigurationSection> children, IConfigurationSection variables, bool isTargetsSection)`
`216`	`218`	`{`
`217`		`- var defaultTargetWrapper = GetDefaultWrapperSection();`
`218`		`- var defaultTargetParameters = GetDefaultTargetParametersSection();`
	`219`	`+ var targetDefaultWrapper = GetTargetDefaultWrapperSection();`
	`220`	`+ var targetDefaultParameters = GetTargetDefaultParametersSection();`
`219`	`221`	`foreach (var child in children)`
`220`	`222`	`{`
`221`		`- if (AlreadyReadChild(child, variables, defaultTargetWrapper, defaultTargetParameters))`
	`223`	`+ if (AlreadyReadChild(child, variables, targetDefaultWrapper, targetDefaultParameters))`
`222`	`224`	`{`
`223`	`225`	`continue;`
`224`	`226`	`}`
`@@ -231,34 +233,23 @@ private IEnumerable<ILoggingConfigurationElement> GetChildren(IEnumerable<IConfi`
`231`	`233`
`232`	`234`	`if (IsTargetWithinWrapper(child))`
`233`	`235`	`{`
`234`		`- yield return new LoggingConfigurationElement(firstChildValue, false, TargetKey);`
	`236`	`+ yield return new LoggingConfigurationElement(firstChildValue, TargetKey);`
	`237`	`+ }`
	`238`	`+ else if (_topElement && GetConfigKey(child).EqualsOrdinalIgnoreCase(TargetsKey))`
	`239`	`+ {`
	`240`	`+ yield return new LoggingConfigurationElement(child)`
	`241`	`+ {`
	`242`	`+ TargetDefaultParametersSection = targetDefaultParameters,`
	`243`	`+ TargetDefaultWrapperSection = targetDefaultWrapper,`
	`244`	`+ };`
`235`	`245`	`}`
`236`	`246`	`else`
`237`	`247`	`{`
`238`		`- yield return CreateLoggingConfigurationElement(isTargetsSection, child, defaultTargetParameters, defaultTargetWrapper);`
	`248`	`+ yield return new LoggingConfigurationElement(child, isTargetsSection ? TargetKey : null);`
`239`	`249`	`}`
`240`	`250`	`}`
`241`	`251`	`}`
`242`	`252`
`243`		`- private static LoggingConfigurationElement CreateLoggingConfigurationElement(bool isTargetsSection, IConfigurationSection child, IConfigurationSection defaultTargetParameters, IConfigurationSection defaultTargetWrapper)`
`244`		`- {`
`245`		`- IConfigurationSection defaultTargetParametersSection = null;`
`246`		`- IConfigurationSection defaultTargetWrapperSection = null;`
`247`		`-`
`248`		`- if (defaultTargetParameters != null \|\| defaultTargetWrapper != null)`
`249`		`- {`
`250`		`- var isTargetsKey = GetConfigKey(child).EqualsOrdinalIgnoreCase(TargetsKey);`
`251`		`- defaultTargetParametersSection = defaultTargetParameters != null && isTargetsKey ? defaultTargetParameters : null;`
`252`		`- defaultTargetWrapperSection = defaultTargetWrapper != null && isTargetsKey ? defaultTargetWrapper : null;`
`253`		`- }`
`254`		`-`
`255`		`- return new LoggingConfigurationElement(child, false, isTargetsSection ? TargetKey : null)`
`256`		`- {`
`257`		`- DefaultTargetParametersSection = defaultTargetParametersSection,`
`258`		`- DefaultTargetWrapperSection = defaultTargetWrapperSection,`
`259`		`- };`
`260`		`- }`
`261`		`-`
`262`	`253`	`private static string GetConfigKey(IConfigurationSection child)`
`263`	`254`	`{`
`264`	`255`	`return child.Key?.Trim() ?? string.Empty;`
`@@ -272,28 +263,26 @@ private bool IsTargetsSection()`
`272`	`263`	`/// <summary>`
`273`	`264`	`/// Target-config inside Wrapper-Target`
`274`	`265`	`/// </summary>`
`275`		`- /// <param name="child"></param>`
`276`		`- /// <returns></returns>`
`277`	`266`	`private bool IsTargetWithinWrapper(IConfigurationSection child)`
`278`	`267`	`{`
`279`	`268`	`return _nameOverride == TargetKey && GetConfigKey(child).EqualsOrdinalIgnoreCase(TargetKey) && child.GetChildren().Count() == 1;`
`280`	`269`	`}`
`281`	`270`
`282`	`271`	`private IEnumerable<LoggingConfigurationElement> GetTargetsDefaultConfigElements()`
`283`	`272`	`{`
`284`		`- if (DefaultTargetWrapperSection != null)`
`285`		`- yield return new LoggingConfigurationElement(DefaultTargetWrapperSection, true, DefaultWrapper);`
	`273`	`+ if (TargetDefaultWrapperSection != null)`
	`274`	`+ yield return new LoggingConfigurationElement(TargetDefaultWrapperSection, DefaultWrapper);`
`286`	`275`
`287`		`- if (DefaultTargetParametersSection != null)`
	`276`	`+ if (TargetDefaultParametersSection != null)`
`288`	`277`	`{`
`289`		`- foreach (var targetParameters in DefaultTargetParametersSection.GetChildren())`
	`278`	`+ foreach (var targetParameters in TargetDefaultParametersSection.GetChildren())`
`290`	`279`	`{`
`291`		`- yield return new LoggingConfigurationElement(targetParameters, true, DefaultTargetParameters);`
	`280`	`+ yield return new LoggingConfigurationElement(targetParameters, DefaultTargetParameters);`
`292`	`281`	`}`
`293`	`282`	`}`
`294`	`283`	`}`
`295`	`284`
`296`		`- private bool AlreadyReadChild(IConfigurationSection child, IConfigurationSection variables, IConfigurationSection defaultWrapper, IConfigurationSection defaultTargetParameters)`
	`285`	`+ private bool AlreadyReadChild(IConfigurationSection child, IConfigurationSection variables, IConfigurationSection targetDefaultWrapper, IConfigurationSection targetDefaultParameters)`
`297`	`286`	`{`
`298`	`287`	`if (_topElement)`
`299`	`288`	`{`
`@@ -302,12 +291,12 @@ private bool AlreadyReadChild(IConfigurationSection child, IConfigurationSection`
`302`	`291`	`return true;`
`303`	`292`	`}`
`304`	`293`
`305`		`- if (defaultWrapper != null && child.Key.EqualsOrdinalIgnoreCase(defaultWrapper.Key))`
	`294`	`+ if (targetDefaultWrapper != null && child.Key.EqualsOrdinalIgnoreCase(targetDefaultWrapper.Key))`
`306`	`295`	`{`
`307`	`296`	`return true;`
`308`	`297`	`}`
`309`	`298`
`310`		`- if (defaultTargetParameters != null && child.Key.EqualsOrdinalIgnoreCase(defaultTargetParameters.Key))`
	`299`	`+ if (targetDefaultParameters != null && child.Key.EqualsOrdinalIgnoreCase(targetDefaultParameters.Key))`
`311`	`300`	`{`
`312`	`301`	`return true;`
`313`	`302`	`}`
`@@ -322,27 +311,50 @@ private IConfigurationSection GetVariablesSection()`
`322`	`311`	`return variables;`
`323`	`312`	`}`
`324`	`313`
`325`		`- private IConfigurationSection GetDefaultTargetParametersSection()`
	`314`	`+ private IConfigurationSection GetTargetDefaultParametersSection()`
`326`	`315`	`{`
`327`		`- var defaultTargetParameters = _topElement ? _configurationSection.GetSection(DefaultTargetParameters) : null;`
`328`		`- if (defaultTargetParameters != null && defaultTargetParameters.GetChildren().Any())`
	`316`	`+ if (_topElement)`
`329`	`317`	`{`
`330`		`- return defaultTargetParameters;`
	`318`	`+ var targetDefaultParameters = _configurationSection.GetSection(TargetDefaultParameters);`
	`319`	`+ if (targetDefaultParameters?.GetChildren().Any() == true)`
	`320`	`+ {`
	`321`	`+ return targetDefaultParameters;`
	`322`	`+ }`
	`323`	`+`
	`324`	`+ targetDefaultParameters = _configurationSection.GetSection(DefaultTargetParameters);`
	`325`	`+ if (targetDefaultParameters?.GetChildren().Any() == true)`
	`326`	`+ {`
	`327`	`+ return targetDefaultParameters;`
	`328`	`+ }`
`331`	`329`	`}`
`332`	`330`
`333`	`331`	`return null;`
`334`	`332`	`}`
`335`	`333`
`336`		`- private IConfigurationSection GetDefaultWrapperSection()`
	`334`	`+ private IConfigurationSection GetTargetDefaultWrapperSection()`
`337`	`335`	`{`
`338`		`- var defaultWrapper = _topElement ? _configurationSection.GetSection(DefaultWrapper) : null;`
`339`		`- if (defaultWrapper != null && defaultWrapper.GetChildren().Any())`
	`336`	`+ if (_topElement)`
`340`	`337`	`{`
`341`		`- return defaultWrapper;`
	`338`	`+ var targetDefaultWrapper = _configurationSection.GetSection(TargetDefaultWrapper);`
	`339`	`+ if (targetDefaultWrapper?.GetChildren().Any() == true)`
	`340`	`+ {`
	`341`	`+ return targetDefaultWrapper;`
	`342`	`+ }`
	`343`	`+`
	`344`	`+ targetDefaultWrapper = _configurationSection.GetSection(DefaultWrapper);`
	`345`	`+ if (targetDefaultWrapper?.GetChildren().Any() == true)`
	`346`	`+ {`
	`347`	`+ return targetDefaultWrapper;`
	`348`	`+ }`
`342`	`349`	`}`
`343`	`350`
`344`	`351`	`return null;`
`345`	`352`	`}`
	`353`	`+`
	`354`	`+ public override string ToString()`
	`355`	`+ {`
	`356`	`+ return Name;`
	`357`	`+ }`
`346`	`358`	`}`
`347`	`359`	`}`
`348`	`360`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public static ISetupBuilder LoadConfigurationFromSection(this ISetupBuilder setu`
`17`	`17`	`if (!string.IsNullOrEmpty(configSection))`
`18`	`18`	`{`
`19`	`19`	`var nlogConfig = configuration.GetSection(configSection);`
`20`		`- if (nlogConfig != null && nlogConfig.GetChildren().Any())`
	`20`	`+ if (nlogConfig?.GetChildren().Any() == true)`
`21`	`21`	`{`
`22`	`22`	`setupBuilder.LogFactory.Configuration = new NLogLoggingConfiguration(nlogConfig, setupBuilder.LogFactory);`
`23`	`23`	`}`