fix: switches formatters

This commit is contained in:
Neil Dorin
2023-11-20 15:40:00 -07:00
parent 29c3fe22b1
commit fac210676c

View File

@@ -12,6 +12,7 @@ using Serilog;
using Serilog.Core; using Serilog.Core;
using Serilog.Events; using Serilog.Events;
using Serilog.Formatting.Compact; using Serilog.Formatting.Compact;
using Serilog.Formatting.Json;
namespace PepperDash.Core namespace PepperDash.Core
{ {
@@ -107,7 +108,7 @@ namespace PepperDash.Core
{ {
_consoleLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: LogEventLevel.Information); _consoleLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: LogEventLevel.Information);
_websocketLoggingLevelSwitch = new LoggingLevelSwitch(); _websocketLoggingLevelSwitch = new LoggingLevelSwitch();
_websocketSink = new DebugWebsocketSink(new CompactJsonFormatter()); _websocketSink = new DebugWebsocketSink(new JsonFormatter());
// Instantiate the root logger // Instantiate the root logger
_logger = new LoggerConfiguration() _logger = new LoggerConfiguration()
@@ -470,12 +471,13 @@ namespace PepperDash.Core
/// </summary> /// </summary>
public static void Console(uint level, IKeyed dev, string format, params object[] items) 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) if (Level >= level)
Console(level, "[{0}] {1}", dev.Key, string.Format(format, items)); Console(level, "[{0}] {1}", dev.Key, message);
} }
/// <summary> /// <summary>