More fixes

dotnet · Jul 17, 2024 · afb13cd · afb13cd
1 parent 71df064
commit afb13cd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git 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<BufferedLogRecord> records)
 
             StringWriter writer = t_stringWriter ??= new StringWriter();
 
+            var sb = writer.GetStringBuilder();
             foreach (var rec in records)
             {
                 var logEntry = new LogEntry<BufferedLogRecord>(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
@@ -42,7 +42,9 @@ public override void Write<TState>(in LogEntry<TState> 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
@@ -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
@@ -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)