NLogLogger - Move some complexity out of Log-method

NLog · Aug 1, 2018 · 005df7a · 005df7a
1 parent 728870a
commit 005df7a
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/NLog.Extensions.Logging/Logging/NLogLogger.cs b/src/NLog.Extensions.Logging/Logging/NLogLogger.cs
@@ -59,12 +59,9 @@ public void Log<TState>(Microsoft.Extensions.Logging.LogLevel logLevel, EventId
                 eventInfo.Exception = exception;
             }
 
-            if (messageParameters == null && _options.CaptureMessageProperties)
+            if (messageParameters == null && messageProperties == null && _options.CaptureMessageProperties)
             {
-                if (!CaptureMessagePropertiesList(eventInfo, messageProperties))
-                {
-                    CaptureMessageProperties(eventInfo, state);
-                }
+                CaptureMessageProperties(eventInfo, state);
             }
 
             CaptureEventId(eventInfo, eventId);
@@ -90,14 +87,18 @@ private LogEventInfo CreateLogEventInfo(LogLevel nLogLogLevel, string message, I
             {
                 // Parsing failed or no messageParameters
                 var eventInfo = LogEventInfo.Create(nLogLogLevel, _logger.Name, message);
-                if (messageParameters?.Count > 0)
+                if (messageParameters != null)
                 {
                     for (int i = 0; i < messageParameters.Count; ++i)
                     {
                         var property = messageParameters[i];
                         eventInfo.Properties[property.Name] = property.Value;
                     }
                 }
+                else if (messageProperties != null && _options.CaptureMessageProperties)
+                {
+                    CaptureMessagePropertiesList(eventInfo, messageProperties);
+                }
                 return eventInfo;
             }
         }