@@ -146,7 +146,7 @@ void ApplyMinimumLevel(LoggerConfiguration loggerConfiguration)
146
146
var defaultMinLevelDirective = minimumLevelDirective . Value != null ? minimumLevelDirective : minimumLevelDirective . GetSection ( "Default" ) ;
147
147
if ( defaultMinLevelDirective . Value != null )
148
148
{
149
- ApplyMinimumLevel ( defaultMinLevelDirective , ( configuration , levelSwitch ) => configuration . ControlledBy ( levelSwitch ) ) ;
149
+ ApplyMinimumLevelConfiguration ( defaultMinLevelDirective , ( configuration , levelSwitch ) => configuration . ControlledBy ( levelSwitch ) ) ;
150
150
}
151
151
152
152
var minLevelControlledByDirective = minimumLevelDirective . GetSection ( "ControlledBy" ) ;
@@ -163,7 +163,7 @@ void ApplyMinimumLevel(LoggerConfiguration loggerConfiguration)
163
163
var overridenLevelOrSwitch = overrideDirective . Value ;
164
164
if ( Enum . TryParse ( overridenLevelOrSwitch , out LogEventLevel _ ) )
165
165
{
166
- ApplyMinimumLevel ( overrideDirective , ( configuration , levelSwitch ) => configuration . Override ( overridePrefix , levelSwitch ) ) ;
166
+ ApplyMinimumLevelConfiguration ( overrideDirective , ( configuration , levelSwitch ) => configuration . Override ( overridePrefix , levelSwitch ) ) ;
167
167
}
168
168
else
169
169
{
@@ -173,7 +173,7 @@ void ApplyMinimumLevel(LoggerConfiguration loggerConfiguration)
173
173
}
174
174
}
175
175
176
- void ApplyMinimumLevel ( IConfigurationSection directive , Action < LoggerMinimumLevelConfiguration , LoggingLevelSwitch > applyConfigAction )
176
+ void ApplyMinimumLevelConfiguration ( IConfigurationSection directive , Action < LoggerMinimumLevelConfiguration , LoggingLevelSwitch > applyConfigAction )
177
177
{
178
178
var minimumLevel = ParseLogEventLevel ( directive . Value ) ;
179
179
@@ -261,9 +261,9 @@ void ApplyEnrichment(LoggerConfiguration loggerConfiguration)
261
261
var propertiesDirective = _section . GetSection ( "Properties" ) ;
262
262
if ( propertiesDirective . GetChildren ( ) . Any ( ) )
263
263
{
264
- foreach ( var enrichProperyDirective in propertiesDirective . GetChildren ( ) )
264
+ foreach ( var enrichPropertyDirective in propertiesDirective . GetChildren ( ) )
265
265
{
266
- loggerConfiguration . Enrich . WithProperty ( enrichProperyDirective . Key , enrichProperyDirective . Value ) ;
266
+ loggerConfiguration . Enrich . WithProperty ( enrichPropertyDirective . Key , enrichPropertyDirective . Value ) ;
267
267
}
268
268
}
269
269
}
@@ -356,11 +356,11 @@ static IReadOnlyCollection<Assembly> LoadConfigurationAssemblies(IConfigurationS
356
356
return assemblies . Values . ToList ( ) . AsReadOnly ( ) ;
357
357
}
358
358
359
- void CallConfigurationMethods ( ILookup < string , Dictionary < string , IConfigurationArgumentValue > > methods , IList < MethodInfo > configurationMethods , object receiver )
359
+ void CallConfigurationMethods ( ILookup < string , Dictionary < string , IConfigurationArgumentValue > > methods , IReadOnlyCollection < MethodInfo > configurationMethods , object receiver )
360
360
{
361
361
foreach ( var method in methods . SelectMany ( g => g . Select ( x => new { g . Key , Value = x } ) ) )
362
362
{
363
- var methodInfo = SelectConfigurationMethod ( configurationMethods , method . Key , method . Value . Keys ) ;
363
+ var methodInfo = SelectConfigurationMethod ( configurationMethods , method . Key , method . Value . Keys . ToList ( ) ) ;
364
364
365
365
if ( methodInfo != null )
366
366
{
@@ -409,7 +409,7 @@ object GetImplicitValueForNotSpecifiedKey(ParameterInfo parameter, MethodInfo me
409
409
return parameter . DefaultValue ;
410
410
}
411
411
412
- internal static MethodInfo SelectConfigurationMethod ( IEnumerable < MethodInfo > candidateMethods , string name , IEnumerable < string > suppliedArgumentNames )
412
+ internal static MethodInfo SelectConfigurationMethod ( IReadOnlyCollection < MethodInfo > candidateMethods , string name , IReadOnlyCollection < string > suppliedArgumentNames )
413
413
{
414
414
// Per issue #111, it is safe to use case-insensitive matching on argument names. The CLR doesn't permit this type
415
415
// of overloading, and the Microsoft.Extensions.Configuration keys are case-insensitive (case is preserved with some
@@ -464,7 +464,7 @@ static bool ParameterNameMatches(string actualParameterName, IEnumerable<string>
464
464
return suppliedNames . Any ( s => ParameterNameMatches ( actualParameterName , s ) ) ;
465
465
}
466
466
467
- static IList < MethodInfo > FindSinkConfigurationMethods ( IReadOnlyCollection < Assembly > configurationAssemblies )
467
+ static IReadOnlyCollection < MethodInfo > FindSinkConfigurationMethods ( IReadOnlyCollection < Assembly > configurationAssemblies )
468
468
{
469
469
var found = FindConfigurationExtensionMethods ( configurationAssemblies , typeof ( LoggerSinkConfiguration ) ) ;
470
470
if ( configurationAssemblies . Contains ( typeof ( LoggerSinkConfiguration ) . GetTypeInfo ( ) . Assembly ) )
@@ -473,15 +473,15 @@ static IList<MethodInfo> FindSinkConfigurationMethods(IReadOnlyCollection<Assemb
473
473
return found ;
474
474
}
475
475
476
- static IList < MethodInfo > FindAuditSinkConfigurationMethods ( IReadOnlyCollection < Assembly > configurationAssemblies )
476
+ static IReadOnlyCollection < MethodInfo > FindAuditSinkConfigurationMethods ( IReadOnlyCollection < Assembly > configurationAssemblies )
477
477
{
478
478
var found = FindConfigurationExtensionMethods ( configurationAssemblies , typeof ( LoggerAuditSinkConfiguration ) ) ;
479
479
if ( configurationAssemblies . Contains ( typeof ( LoggerAuditSinkConfiguration ) . GetTypeInfo ( ) . Assembly ) )
480
480
found . AddRange ( SurrogateConfigurationMethods . AuditTo ) ;
481
481
return found ;
482
482
}
483
483
484
- static IList < MethodInfo > FindFilterConfigurationMethods ( IReadOnlyCollection < Assembly > configurationAssemblies )
484
+ static IReadOnlyCollection < MethodInfo > FindFilterConfigurationMethods ( IReadOnlyCollection < Assembly > configurationAssemblies )
485
485
{
486
486
var found = FindConfigurationExtensionMethods ( configurationAssemblies , typeof ( LoggerFilterConfiguration ) ) ;
487
487
if ( configurationAssemblies . Contains ( typeof ( LoggerFilterConfiguration ) . GetTypeInfo ( ) . Assembly ) )
@@ -490,7 +490,7 @@ static IList<MethodInfo> FindFilterConfigurationMethods(IReadOnlyCollection<Asse
490
490
return found ;
491
491
}
492
492
493
- static IList < MethodInfo > FindDestructureConfigurationMethods ( IReadOnlyCollection < Assembly > configurationAssemblies )
493
+ static IReadOnlyCollection < MethodInfo > FindDestructureConfigurationMethods ( IReadOnlyCollection < Assembly > configurationAssemblies )
494
494
{
495
495
var found = FindConfigurationExtensionMethods ( configurationAssemblies , typeof ( LoggerDestructuringConfiguration ) ) ;
496
496
if ( configurationAssemblies . Contains ( typeof ( LoggerDestructuringConfiguration ) . GetTypeInfo ( ) . Assembly ) )
@@ -499,7 +499,7 @@ static IList<MethodInfo> FindDestructureConfigurationMethods(IReadOnlyCollection
499
499
return found ;
500
500
}
501
501
502
- static IList < MethodInfo > FindEventEnricherConfigurationMethods ( IReadOnlyCollection < Assembly > configurationAssemblies )
502
+ static IReadOnlyCollection < MethodInfo > FindEventEnricherConfigurationMethods ( IReadOnlyCollection < Assembly > configurationAssemblies )
503
503
{
504
504
var found = FindConfigurationExtensionMethods ( configurationAssemblies , typeof ( LoggerEnrichmentConfiguration ) ) ;
505
505
if ( configurationAssemblies . Contains ( typeof ( LoggerEnrichmentConfiguration ) . GetTypeInfo ( ) . Assembly ) )
0 commit comments