From 7a2fa1dbb89c6977f9e50ec6b65d99e5e7377f1a Mon Sep 17 00:00:00 2001 From: jods Date: Tue, 13 Feb 2024 00:43:33 +0100 Subject: [PATCH 1/2] Minor optimisations Fixes #241 --- .../Extensions/Logging/SerilogLogger.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs b/src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs index 06efe62..3aa7fb1 100644 --- a/src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs +++ b/src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs @@ -103,12 +103,12 @@ LogEvent PrepareWrite(LogEventLevel level, EventId eventId, TState state { messageTemplate = value; } - else if (property.Key.StartsWith("@")) + else if (property.Key.StartsWith('@')) { if (_logger.BindProperty(GetKeyWithoutFirstSymbol(DestructureDictionary, property.Key), property.Value, true, out var destructured)) properties.Add(destructured); } - else if (property.Key.StartsWith("$")) + else if (property.Key.StartsWith('$')) { if (_logger.BindProperty(GetKeyWithoutFirstSymbol(StringifyDictionary, property.Key), property.Value?.ToString(), true, out var stringified)) properties.Add(stringified); @@ -167,10 +167,10 @@ LogEvent PrepareWrite(LogEventLevel level, EventId eventId, TState state static object? AsLoggableValue(TState state, Func? formatter) { - object? stateObj = state; + object? stateObj = null; if (formatter != null) stateObj = formatter(state, null); - return stateObj; + return stateObj ?? state; } internal static LogEventProperty CreateEventIdProperty(EventId eventId) From 76a05eeb420fce30f5417b77e73a048148ec2a69 Mon Sep 17 00:00:00 2001 From: jods Date: Tue, 13 Feb 2024 00:50:38 +0100 Subject: [PATCH 2/2] Revert String.StartsWith, not present in old .net fx --- .../Extensions/Logging/SerilogLogger.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs b/src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs index 3aa7fb1..9a82609 100644 --- a/src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs +++ b/src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs @@ -103,12 +103,12 @@ LogEvent PrepareWrite(LogEventLevel level, EventId eventId, TState state { messageTemplate = value; } - else if (property.Key.StartsWith('@')) + else if (property.Key.StartsWith("@")) { if (_logger.BindProperty(GetKeyWithoutFirstSymbol(DestructureDictionary, property.Key), property.Value, true, out var destructured)) properties.Add(destructured); } - else if (property.Key.StartsWith('$')) + else if (property.Key.StartsWith("$")) { if (_logger.BindProperty(GetKeyWithoutFirstSymbol(StringifyDictionary, property.Key), property.Value?.ToString(), true, out var stringified)) properties.Add(stringified);