fix: match error log & console formats

PepperDash · May 16, 2024 · e581eed · e581eed
1 parent d7f5743
commit e581eed
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/src/Pepperdash Core/Logging/Debug.cs b/src/Pepperdash Core/Logging/Debug.cs
@@ -150,7 +150,7 @@ static Debug()
                 .Enrich.With(new CrestronEnricher())
                 .WriteTo.Sink(new DebugConsoleSink(new ExpressionTemplate("[{@t:yyyy-MM-dd HH:mm:ss.fff}][{@l:u4}][{App}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}")), levelSwitch: _consoleLoggingLevelSwitch)
                 .WriteTo.Sink(_websocketSink, levelSwitch: _websocketLoggingLevelSwitch)
-                .WriteTo.Sink(new DebugErrorLogSink(), levelSwitch: _errorLogLevelSwitch)
+                .WriteTo.Sink(new DebugErrorLogSink(new ExpressionTemplate("[{@t:yyyy-MM-dd HH:mm:ss.fff}][{@l:u4}][{App}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}")), levelSwitch: _errorLogLevelSwitch)
                 .WriteTo.File(new RenderedCompactJsonFormatter(), logFilePath,                                    
                     rollingInterval: RollingInterval.Day,
                     restrictedToMinimumLevel: LogEventLevel.Debug,

diff --git a/src/Pepperdash Core/Logging/DebugErrorLogSink.cs b/src/Pepperdash Core/Logging/DebugErrorLogSink.cs
@@ -1,8 +1,10 @@
 using Crestron.SimplSharp;
 using Serilog.Core;
 using Serilog.Events;
+using Serilog.Formatting;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -11,6 +13,8 @@ namespace PepperDash.Core.Logging
 {
     public class DebugErrorLogSink : ILogEventSink
     {
+        private ITextFormatter _formatter;
+
         private Dictionary<LogEventLevel, Action<string>> _errorLogMap = new Dictionary<LogEventLevel, Action<string>>
         {
             { LogEventLevel.Verbose, (msg) => ErrorLog.Notice(msg) },
@@ -22,15 +26,27 @@ public class DebugErrorLogSink : ILogEventSink
         };
         public void Emit(LogEvent logEvent)
         {
-            var programId = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance
-                ? $"App {InitialParametersClass.ApplicationNumber}"
-                : $"Room {InitialParametersClass.RoomId}";
+            string message;
+
+            if (_formatter == null)
+            {
+                var programId = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance
+                    ? $"App {InitialParametersClass.ApplicationNumber}"
+                    : $"Room {InitialParametersClass.RoomId}";
 
-            string message = $"[{logEvent.Timestamp}][{logEvent.Level}][{programId}]{logEvent.RenderMessage()}";
+                message = $"[{logEvent.Timestamp}][{logEvent.Level}][{programId}]{logEvent.RenderMessage()}";
 
-            if (logEvent.Properties.TryGetValue("Key", out var value) && value is ScalarValue sv && sv.Value is string rawValue)
+                if (logEvent.Properties.TryGetValue("Key", out var value) && value is ScalarValue sv && sv.Value is string rawValue)
+                {
+                    message = $"[{logEvent.Timestamp}][{logEvent.Level}][{programId}][{rawValue}]: {logEvent.RenderMessage()}";
+                }
+            } else
             {
-                message = $"[{logEvent.Timestamp}][{logEvent.Level}][{programId}][{rawValue}]: {logEvent.RenderMessage()}";
+                var buffer = new StringWriter(new StringBuilder(256));
+
+                _formatter.Format(logEvent, buffer);
+
+                message = buffer.ToString();
             }
 
             if(!_errorLogMap.TryGetValue(logEvent.Level, out var handler))
@@ -40,5 +56,10 @@ public void Emit(LogEvent logEvent)
 
             handler(message);
         }
+
+        public DebugErrorLogSink(ITextFormatter formatter = null)
+        {
+            _formatter = formatter;
+        }
     }
 }