Merge pull request #17 from tetious/feature/split-layout-message

Split the message from the layout renderer instead of just the eventInfo message.
luigiberrettini · Jul 31, 2014 · 196e7db · 196e7db
2 parents be505ea + a25f55c
commit 196e7db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/NLog.Targets.Syslog/NLog.Targets.Syslog.cs b/src/NLog.Targets.Syslog/NLog.Targets.Syslog.cs
@@ -90,15 +90,15 @@ public Syslog()
         protected override void Write(LogEventInfo logEvent)
         {            
             // Store the current UI culture
-            CultureInfo currentCulture = Thread.CurrentThread.CurrentCulture;
+            var currentCulture = Thread.CurrentThread.CurrentCulture;
             // Set the current Locale to "en-US" for proper date formatting
             Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
 
-            string[] formattedMessageLines = logEvent.FormattedMessage.Split(new char[] {'\r', '\n'}, StringSplitOptions.RemoveEmptyEntries);
+            var formattedMessageLines = Layout.Render(logEvent).Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
+            var severity = GetSyslogSeverity(logEvent.Level);
             foreach (var formattedMessageLine in formattedMessageLines)
             {
-                logEvent.Message = formattedMessageLine;
-                byte[] message = BuildSyslogMessage(Facility, GetSyslogSeverity(logEvent.Level), DateTime.Now, Sender, Layout.Render(logEvent));
+                var message = BuildSyslogMessage(Facility, severity, DateTime.Now, Sender, formattedMessageLine);
                 SendMessage(SyslogServer, Port, message, Protocol, Ssl);
             }
 

diff --git a/src/NLog.Targets.Syslog/Properties/AssemblyInfo.cs b/src/NLog.Targets.Syslog/Properties/AssemblyInfo.cs
@@ -33,3 +33,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("2.0.*")]
 [assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyInformationalVersion("2.0.1")]