From f3f23b4bde8b0a449d57ef600d99560ac97a784e Mon Sep 17 00:00:00 2001 From: Maryam Ariyan Date: Fri, 24 Jul 2020 18:26:56 -0700 Subject: [PATCH] Avoid using DateTime - Switch to DateTimeOffset (#39916) --- .../src/JsonConsoleFormatter.cs | 4 ++-- .../src/SimpleConsoleFormatter.cs | 8 ++++---- .../src/SystemdConsoleFormatter.cs | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/JsonConsoleFormatter.cs b/src/libraries/Microsoft.Extensions.Logging.Console/src/JsonConsoleFormatter.cs index 68aa95a..418350e 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/JsonConsoleFormatter.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/JsonConsoleFormatter.cs @@ -45,8 +45,8 @@ namespace Microsoft.Extensions.Logging.Console var timestampFormat = FormatterOptions.TimestampFormat; if (timestampFormat != null) { - var dateTime = FormatterOptions.UseUtcTimestamp ? DateTime.UtcNow : DateTime.Now; - timestamp = dateTime.ToString(timestampFormat); + DateTimeOffset dateTimeOffset = FormatterOptions.UseUtcTimestamp ? DateTimeOffset.UtcNow : DateTimeOffset.Now; + timestamp = dateTimeOffset.ToString(timestampFormat); } writer.WriteString("Timestamp", timestamp); writer.WriteNumber(nameof(logEntry.EventId), eventId); diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/SimpleConsoleFormatter.cs b/src/libraries/Microsoft.Extensions.Logging.Console/src/SimpleConsoleFormatter.cs index f9452ed..f5b0571 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/SimpleConsoleFormatter.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/SimpleConsoleFormatter.cs @@ -53,8 +53,8 @@ namespace Microsoft.Extensions.Logging.Console string timestampFormat = FormatterOptions.TimestampFormat; if (timestampFormat != null) { - DateTime dateTime = GetCurrentDateTime(); - timestamp = dateTime.ToString(timestampFormat); + DateTimeOffset dateTimeOffset = GetCurrentDateTime(); + timestamp = dateTimeOffset.ToString(timestampFormat); } if (timestamp != null) { @@ -126,9 +126,9 @@ namespace Microsoft.Extensions.Logging.Console } } - private DateTime GetCurrentDateTime() + private DateTimeOffset GetCurrentDateTime() { - return FormatterOptions.UseUtcTimestamp ? DateTime.UtcNow : DateTime.Now; + return FormatterOptions.UseUtcTimestamp ? DateTimeOffset.UtcNow : DateTimeOffset.Now; } 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 0140adf..1916dd2 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/SystemdConsoleFormatter.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/SystemdConsoleFormatter.cs @@ -57,8 +57,8 @@ namespace Microsoft.Extensions.Logging.Console string timestampFormat = FormatterOptions.TimestampFormat; if (timestampFormat != null) { - DateTime dateTime = GetCurrentDateTime(); - textWriter.Write(dateTime.ToString(timestampFormat)); + DateTimeOffset dateTimeOffset = GetCurrentDateTime(); + textWriter.Write(dateTimeOffset.ToString(timestampFormat)); } // category and event id @@ -96,9 +96,9 @@ namespace Microsoft.Extensions.Logging.Console } } - private DateTime GetCurrentDateTime() + private DateTimeOffset GetCurrentDateTime() { - return FormatterOptions.UseUtcTimestamp ? DateTime.UtcNow : DateTime.Now; + return FormatterOptions.UseUtcTimestamp ? DateTimeOffset.UtcNow : DateTimeOffset.Now; } private static string GetSyslogSeverityString(LogLevel logLevel) -- 2.7.4