NLogLogger - Move some complexity out of Log-method

NLog · Aug 2, 2018 · b86da07 · b86da07
1 parent 25b231d
commit b86da07
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/NLog.Extensions.Logging/Logging/NLogLogger.cs b/src/NLog.Extensions.Logging/Logging/NLogLogger.cs
@@ -46,6 +46,11 @@ public void Log<TState>(Microsoft.Extensions.Logging.LogLevel logLevel, EventId
 
             CaptureEventId(eventInfo, eventId);
 
+            if (exception != null)
+            {
+                eventInfo.Exception = exception;
+            }
+
             _logger.Log(typeof(Microsoft.Extensions.Logging.ILogger), eventInfo);
         }
 
@@ -59,25 +64,24 @@ private LogEventInfo CreateLogEventInfo<TState>(LogLevel nLogLogLevel, TState st
                 ? NLogMessageParameterList.TryParse(messageProperties)
                 : null;
 
-            string formattedMesage = null;
             LogEventInfo eventInfo =
                 TryParseMessageTemplate(nLogLogLevel, messageProperties, messageParameters) ??
-                TryCaptureMessageTemplate(nLogLogLevel, formattedMesage ?? (formattedMesage = formatter(state, exception)), messageProperties, messageParameters) ??
-                CreateSimpleLogEventInfo(nLogLogLevel, formattedMesage, messageProperties, messageParameters);
+                CreateLogEventInfo(nLogLogLevel, formatter(state, exception), messageProperties, messageParameters);
 
             if (messageParameters == null && messageProperties == null && _options.CaptureMessageProperties)
             {
                 CaptureMessageProperties(eventInfo, state);
             }
 
-            if (exception != null)
-            {
-                eventInfo.Exception = exception;
-            }
-
             return eventInfo;
         }
 
+        private LogEventInfo CreateLogEventInfo(LogLevel nLogLogLevel, string formattedMessage, IReadOnlyList<KeyValuePair<string, object>> messageProperties, NLogMessageParameterList messageParameters)
+        {
+            return TryCaptureMessageTemplate(nLogLogLevel, formattedMessage, messageProperties, messageParameters) ??
+                CreateSimpleLogEventInfo(nLogLogLevel, formattedMessage, messageProperties, messageParameters);
+        }
+
         /// <summary>
         /// Checks if the already parsed input message-parameters must be sent through
         /// the NLog MessageTemplate Parser for proper handling of message-template syntax.