Event enrichers from config refactoring

ite-klass · Jan 17, 2016 · 54fde6c · 54fde6c
1 parent 18cb4c0
commit 54fde6c
Showing 1 changed file with 35 additions and 35 deletions.
diff --git a/src/Serilog/Settings/KeyValuePairs/KeyValuePairSettings.cs b/src/Serilog/Settings/KeyValuePairs/KeyValuePairSettings.cs
@@ -81,10 +81,6 @@ public void Configure(LoggerConfiguration loggerConfiguration)
                 loggerConfiguration.Enrich.WithProperty(name, enrichProperyDirective.Value);
             }
 
-            var eventEnricherDirectives = directives.Where(dir =>
-                dir.Key.StartsWith(EnrichWithEventEnricherPrefix) && !dir.Key.StartsWith(EnrichWithPropertyDirectivePrefix) && dir.Key.Length > EnrichWithEventEnricherPrefix.Length)
-                .Select(dir => dir.Key.Substring(EnrichWithEventEnricherPrefix.Length));
-
             var splitWriteTo = new Regex(WriteToDirectiveRegex);
 
             var sinkDirectives = (from wt in directives
@@ -98,53 +94,57 @@ where splitWriteTo.IsMatch(wt.Key)
                                   }
                                   group call by call.Method).ToList();
 
+            var eventEnricherDirectives = (from er in directives
+                                           where er.Key.StartsWith(EnrichWithEventEnricherPrefix) && !er.Key.StartsWith(EnrichWithPropertyDirectivePrefix) && er.Key.Length > EnrichWithEventEnricherPrefix.Length
+                                           let match = er.Key.Substring(EnrichWithEventEnricherPrefix.Length)
+                                           let call = new MethodArgumentValue
+                                           {
+                                               Method = match
+                                           }
+                                           group call by call.Method).ToList();
+
             if (sinkDirectives.Any() || eventEnricherDirectives.Any())
             {
                 var configurationAssemblies = LoadConfigurationAssemblies(directives);
 
-                ApplyDirectives(eventEnricherDirectives, () => FindEventEnricherConfigurationMethods(configurationAssemblies), loggerConfiguration.Enrich);
-                ApplyDirectives(sinkDirectives, () => FindSinkConfigurationMethods(configurationAssemblies), loggerConfiguration.WriteTo);
-            }
-        }
+                if (sinkDirectives.Any())
+                {
+                    ApplyDirectives(sinkDirectives, FindSinkConfigurationMethods(configurationAssemblies), loggerConfiguration.WriteTo);
+                }
 
-        private static void ApplyDirectives(IEnumerable<string> directives, Func<IList<MethodInfo>> getConfigurationMethods, object loggerConfigMethod)
-        {
-            var directivesGrouped = directives.Select(d => new MethodArgumentValue { Method = d }).GroupBy(m => m.Method).ToList();
-            ApplyDirectives(directivesGrouped, getConfigurationMethods, loggerConfigMethod);
+                if (eventEnricherDirectives.Any())
+                {
+                    ApplyDirectives(eventEnricherDirectives, FindEventEnricherConfigurationMethods(configurationAssemblies), loggerConfiguration.Enrich);
+                }
+            }
         }
 
-
-        private static void ApplyDirectives(List<IGrouping<string, MethodArgumentValue>> directives, Func<IList<MethodInfo>> getConfigurationMethods, object loggerConfigMethod)
+        private static void ApplyDirectives(List<IGrouping<string, MethodArgumentValue>> directives, IList<MethodInfo> configurationMethods, object loggerConfigMethod)
         {
-            if (directives.Any())
+            foreach (var directiveInfo in directives)
             {
-                var configurationMethods = getConfigurationMethods();
-
-                foreach (var directiveInfo in directives)
-                {
-                    var target = configurationMethods
-                        .Where(m => m.Name == directiveInfo.Key &&
-                            m.GetParameters().Skip(1).All(p =>
+                var target = configurationMethods
+                    .Where(m => m.Name == directiveInfo.Key &&
+                        m.GetParameters().Skip(1).All(p =>
 #if NET40
-                            (p.Attributes & ParameterAttributes.HasDefault) != ParameterAttributes.None
+                        (p.Attributes & ParameterAttributes.HasDefault) != ParameterAttributes.None
 #else
-                            p.HasDefaultValue
+                        p.HasDefaultValue
 #endif
-                            || directiveInfo.Any(s => s.Argument == p.Name)))
-                        .OrderByDescending(m => m.GetParameters().Length)
-                        .FirstOrDefault();
+                        || directiveInfo.Any(s => s.Argument == p.Name)))
+                    .OrderByDescending(m => m.GetParameters().Length)
+                    .FirstOrDefault();
 
-                    if (target != null)
-                    {
+                if (target != null)
+                {
 
-                        var call = (from p in target.GetParameters().Skip(1)
-                                    let directive = directiveInfo.FirstOrDefault(s => s.Argument == p.Name)
-                                    select directive == null ? p.DefaultValue : ConvertToType(directive.Value, p.ParameterType)).ToList();
+                    var call = (from p in target.GetParameters().Skip(1)
+                                let directive = directiveInfo.FirstOrDefault(s => s.Argument == p.Name)
+                                select directive == null ? p.DefaultValue : ConvertToType(directive.Value, p.ParameterType)).ToList();
 
-                        call.Insert(0, loggerConfigMethod);
+                    call.Insert(0, loggerConfigMethod);
 
-                        target.Invoke(null, call.ToArray());
-                    }
+                    target.Invoke(null, call.ToArray());
                 }
             }
         }