From fac210676cfcb404a3465ea137ed8d252d6729c5 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Mon, 20 Nov 2023 15:40:00 -0700 Subject: [PATCH] fix: switches formatters --- src/Pepperdash Core/Logging/Debug.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Pepperdash Core/Logging/Debug.cs b/src/Pepperdash Core/Logging/Debug.cs index 4746755..a0ea176 100644 --- a/src/Pepperdash Core/Logging/Debug.cs +++ b/src/Pepperdash Core/Logging/Debug.cs @@ -12,6 +12,7 @@ using Serilog; using Serilog.Core; using Serilog.Events; using Serilog.Formatting.Compact; +using Serilog.Formatting.Json; namespace PepperDash.Core { @@ -107,7 +108,7 @@ namespace PepperDash.Core { _consoleLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: LogEventLevel.Information); _websocketLoggingLevelSwitch = new LoggingLevelSwitch(); - _websocketSink = new DebugWebsocketSink(new CompactJsonFormatter()); + _websocketSink = new DebugWebsocketSink(new JsonFormatter()); // Instantiate the root logger _logger = new LoggerConfiguration() @@ -470,12 +471,13 @@ namespace PepperDash.Core /// public static void Console(uint level, IKeyed dev, string format, params object[] items) { - var log = _logger.ForContext("Key", dev.Key); + var log = _logger.ForContext("key", dev.Key); + var message = string.Format(format, items); - log.Write((LogEventLevel)level, format, items); + log.Write((LogEventLevel)level, message); if (Level >= level) - Console(level, "[{0}] {1}", dev.Key, string.Format(format, items)); + Console(level, "[{0}] {1}", dev.Key, message); } ///