From afb13cdd40990a7faa2720ef7be240f4adce1f12 Mon Sep 17 00:00:00 2001 From: "Martin Taillefer (from Dev Box)" Date: Tue, 16 Jul 2024 20:23:54 -0700 Subject: [PATCH] More fixes --- .../Microsoft.Extensions.Logging.Console/src/ConsoleLogger.cs | 2 +- .../src/JsonConsoleFormatter.cs | 4 +++- .../src/SimpleConsoleFormatter.cs | 4 +++- .../src/SystemdConsoleFormatter.cs | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/ConsoleLogger.cs b/src/libraries/Microsoft.Extensions.Logging.Console/src/ConsoleLogger.cs index b63dda3bc20183..c030eb059e372a 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/ConsoleLogger.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/ConsoleLogger.cs @@ -77,12 +77,12 @@ public void LogRecords(IEnumerable records) StringWriter writer = t_stringWriter ??= new StringWriter(); + var sb = writer.GetStringBuilder(); foreach (var rec in records) { var logEntry = new LogEntry(rec.LogLevel, _name, rec.EventId, rec, null, static (s, _) => s.FormattedMessage ?? string.Empty); Formatter.Write(in logEntry, null, writer); - var sb = writer.GetStringBuilder(); if (sb.Length == 0) { continue; diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/JsonConsoleFormatter.cs b/src/libraries/Microsoft.Extensions.Logging.Console/src/JsonConsoleFormatter.cs index cceb6d50f07413..1be9425aa310b8 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/JsonConsoleFormatter.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/JsonConsoleFormatter.cs @@ -42,7 +42,9 @@ public override void Write(in LogEntry logEntry, IExternalScopeP return; } - DateTimeOffset stamp = FormatterOptions.UseUtcTimestamp ? DateTimeOffset.UtcNow : DateTimeOffset.Now; + DateTimeOffset stamp = FormatterOptions.TimestampFormat != null + ? (FormatterOptions.UseUtcTimestamp ? DateTimeOffset.UtcNow : DateTimeOffset.Now) + : DateTimeOffset.MinValue; // We extract most of the work into a non-generic method to save code size. If this was left in the generic // method, we'd get generic specialization for all TState parameters, but that's unnecessary. diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/SimpleConsoleFormatter.cs b/src/libraries/Microsoft.Extensions.Logging.Console/src/SimpleConsoleFormatter.cs index c839b0cb90f9b3..9d99836c45b130 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/SimpleConsoleFormatter.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/SimpleConsoleFormatter.cs @@ -155,7 +155,9 @@ static void WriteReplacing(TextWriter writer, string oldValue, string newValue, private DateTimeOffset GetCurrentDateTime() { - return FormatterOptions.UseUtcTimestamp ? DateTimeOffset.UtcNow : DateTimeOffset.Now; + return FormatterOptions.TimestampFormat != null + ? (FormatterOptions.UseUtcTimestamp ? DateTimeOffset.UtcNow : DateTimeOffset.Now) + : DateTimeOffset.MinValue; } private static string GetLogLevelString(LogLevel logLevel) diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/SystemdConsoleFormatter.cs b/src/libraries/Microsoft.Extensions.Logging.Console/src/SystemdConsoleFormatter.cs index b4e9b3e2cb98f3..0df001a0267c75 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/SystemdConsoleFormatter.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/SystemdConsoleFormatter.cs @@ -112,7 +112,9 @@ static void WriteReplacingNewLine(TextWriter writer, string message) private DateTimeOffset GetCurrentDateTime() { - return FormatterOptions.UseUtcTimestamp ? DateTimeOffset.UtcNow : DateTimeOffset.Now; + return FormatterOptions.TimestampFormat != null + ? (FormatterOptions.UseUtcTimestamp ? DateTimeOffset.UtcNow : DateTimeOffset.Now) + : DateTimeOffset.MinValue; } private static string GetSyslogSeverityString(LogLevel logLevel)