From 1c54c4c87d38ad136dd12c4e91d2ab62cfb2b3d8 Mon Sep 17 00:00:00 2001 From: Warren Date: Tue, 14 Aug 2018 15:05:58 +0100 Subject: [PATCH] Update Umbraco ILogger extension methods to have some that support message templates for Serilog * NOTE: Added obsolete with error bool set - to help me find uses to update easier --- src/Umbraco.Core/Logging/LoggerExtensions.cs | 30 ++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/Umbraco.Core/Logging/LoggerExtensions.cs b/src/Umbraco.Core/Logging/LoggerExtensions.cs index 4c0a6b026a..3b5a41f4f2 100644 --- a/src/Umbraco.Core/Logging/LoggerExtensions.cs +++ b/src/Umbraco.Core/Logging/LoggerExtensions.cs @@ -15,11 +15,17 @@ namespace Umbraco.Core.Logging /// The logger. /// A message. /// An exception. + //[Obsolete("Use the Error with message template", true)] public static void Error(this ILogger logger, string message, Exception exception = null) { logger.Error(typeof(T), message, exception); } + public static void Error(this ILogger logger, string messageTemplate, Exception exception = null, params object[] propertyValues) + { + logger.Error(typeof(T), messageTemplate, exception, propertyValues); + } + /// /// Logs a warning message. /// @@ -31,12 +37,18 @@ namespace Umbraco.Core.Logging logger.Warn(typeof(T), message); } + public static void Warn(this ILogger logger, string messageTemplate, params object[] propertyValues) + { + logger.Warn(typeof(T), messageTemplate, propertyValues); + } + /// /// Logs a warning message. /// /// The reporting type. /// The logger. /// A message builder. + [Obsolete("Use the Warn with message template", true)] public static void Warn(this ILogger logger, Func messageBuilder) { logger.Warn(typeof(T), messageBuilder); @@ -49,6 +61,7 @@ namespace Umbraco.Core.Logging /// The logger. /// An exception. /// A message builder. + [Obsolete("Use the Warn with message template", true)] public static void Warn(this ILogger logger, Exception exception, Func messageBuilder) { logger.Warn(typeof(T), exception, messageBuilder); @@ -66,6 +79,11 @@ namespace Umbraco.Core.Logging logger.Warn(typeof(T), exception, message); } + public static void Warn(this ILogger logger, Exception exception, string messageTemplate, params object[] propertyValues) + { + logger.Warn(typeof(T), exception, messageTemplate, propertyValues); + } + /// /// Logs an information message. /// @@ -77,12 +95,18 @@ namespace Umbraco.Core.Logging logger.Info(typeof(T), message); } + public static void Info(this ILogger logger, string messageTemplate, params object[] propertyValues) + { + logger.Info(typeof(T), messageTemplate, propertyValues); + } + /// /// Logs an information message. /// /// The reporting type. /// The logger. /// A message builder. + [Obsolete("Use the Info with message template", true)] public static void Info(this ILogger logger, Func messageBuilder) { logger.Info(typeof(T), messageBuilder); @@ -99,12 +123,18 @@ namespace Umbraco.Core.Logging logger.Debug(typeof(T), message); } + public static void Debug(this ILogger logger, string messageTemplate, params object[] propertyValues) + { + logger.Debug(typeof(T), messageTemplate, propertyValues); + } + /// /// Logs a debugging message. /// /// The reporting type. /// The logger. /// A message builder. + [Obsolete("Use the Debug with message template", true)] public static void Debug(this ILogger logger, Func messageBuilder) { logger.Debug(typeof(T), messageBuilder);