diff --git a/src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs b/src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs
index e492cda0eb..66c9d46ff2 100644
--- a/src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs
+++ b/src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs
@@ -1,5 +1,4 @@
using System;
-using System.Linq;
namespace Umbraco.Core.Logging
{
@@ -25,13 +24,7 @@ namespace Umbraco.Core.Logging
{
System.Diagnostics.Debug.WriteLine(format, reporting.FullName);
}
-
- ///
- public void Warn(Type reporting, Func messageBuilder)
- {
- System.Diagnostics.Debug.WriteLine(messageBuilder(), reporting.FullName);
- }
-
+
///
public void Warn(Type reporting, string format, params object[] args)
{
@@ -44,12 +37,6 @@ namespace Umbraco.Core.Logging
System.Diagnostics.Debug.WriteLine(message + Environment.NewLine + exception, reporting.FullName);
}
- ///
- public void Warn(Type reporting, Exception exception, Func messageBuilder)
- {
- System.Diagnostics.Debug.WriteLine(messageBuilder() + Environment.NewLine + exception, reporting.FullName);
- }
-
///
public void Warn(Type reporting, Exception exception, string format, params object[] args)
{
@@ -62,12 +49,6 @@ namespace Umbraco.Core.Logging
System.Diagnostics.Debug.WriteLine(message, reporting.FullName);
}
- ///
- public void Info(Type reporting, Func messageBuilder)
- {
- System.Diagnostics.Debug.WriteLine(messageBuilder(), reporting.FullName);
- }
-
///
public void Info(Type reporting, string format, params object[] args)
{
@@ -81,13 +62,19 @@ namespace Umbraco.Core.Logging
}
///
- public void Debug(Type reporting, Func messageBuilder)
+ public void Debug(Type reporting, string format, params object[] args)
{
- System.Diagnostics.Debug.WriteLine(messageBuilder(), reporting.FullName);
+ System.Diagnostics.Debug.WriteLine(string.Format(format, args), reporting.FullName);
}
///
- public void Debug(Type reporting, string format, params object[] args)
+ public void Verbose(Type reporting, string message)
+ {
+ System.Diagnostics.Debug.WriteLine(message, reporting.FullName);
+ }
+
+ ///
+ public void Verbose(Type reporting, string format, params object[] args)
{
System.Diagnostics.Debug.WriteLine(string.Format(format, args), reporting.FullName);
}
diff --git a/src/Umbraco.Core/Logging/ILogger.cs b/src/Umbraco.Core/Logging/ILogger.cs
index 7a9ecd2abb..c20f849992 100644
--- a/src/Umbraco.Core/Logging/ILogger.cs
+++ b/src/Umbraco.Core/Logging/ILogger.cs
@@ -85,5 +85,9 @@ namespace Umbraco.Core.Logging
/// The message template that includes property values
/// Property values to log & update in message template
void Debug(Type reporting, string messageTemplate, params object[] propertyValues);
+
+ void Verbose(Type reporting, string message);
+
+ void Verbose(Type reporting, string messageTemplate, params object[] propertyValues);
}
}
diff --git a/src/Umbraco.Core/Logging/Logger.cs b/src/Umbraco.Core/Logging/Logger.cs
index 6e460aaf26..fa65f1bcc2 100644
--- a/src/Umbraco.Core/Logging/Logger.cs
+++ b/src/Umbraco.Core/Logging/Logger.cs
@@ -153,14 +153,7 @@ namespace Umbraco.Core.Logging
var logger = Log.Logger;
logger?.Warning(format);
}
-
- ///
- public void Warn(Type reporting, Func messageBuilder)
- {
- var logger = Log.Logger;
- logger?.Warning(messageBuilder());
- }
-
+
///
public void Warn(Type reporting, string messageTemplate, params object[] propertyValues)
{
@@ -174,14 +167,7 @@ namespace Umbraco.Core.Logging
var logger = Log.Logger;
logger?.ForContext(reporting).Warning(message, exception);
}
-
- ///
- public void Warn(Type reporting, Exception exception, Func messageBuilder)
- {
- var logger = Log.Logger;
- logger?.ForContext(reporting).Warning(messageBuilder(), exception);
- }
-
+
///
public void Warn(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
{
@@ -196,13 +182,6 @@ namespace Umbraco.Core.Logging
logger?.ForContext(reporting).Information(message);
}
- ///
- public void Info(Type reporting, Func generateMessage)
- {
- var logger = Log.Logger;
- logger?.ForContext(reporting).Information(generateMessage());
- }
-
///
public void Info(Type reporting, string messageTemplate, params object[] propertyValues)
{
@@ -216,19 +195,26 @@ namespace Umbraco.Core.Logging
var logger = Log.Logger;
logger?.ForContext(reporting).Debug(message);
}
-
- ///
- public void Debug(Type reporting, Func messageBuilder)
- {
- var logger = Log.Logger;
- logger?.ForContext(reporting).Debug(messageBuilder());
- }
-
+
///
public void Debug(Type reporting, string messageTemplate, params object[] propertyValues)
{
var logger = Log.Logger;
logger?.ForContext(reporting).Debug(messageTemplate, propertyValues);
}
+
+ ///
+ public void Verbose(Type reporting, string message)
+ {
+ var logger = Log.Logger;
+ logger?.ForContext(reporting).Verbose(message);
+ }
+
+ ///
+ public void Verbose(Type reporting, string messageTemplate, params object[] propertyValues)
+ {
+ var logger = Log.Logger;
+ logger?.ForContext(reporting).Verbose(messageTemplate, propertyValues);
+ }
}
}
diff --git a/src/Umbraco.Core/Logging/LoggerExtensions.cs b/src/Umbraco.Core/Logging/LoggerExtensions.cs
index 52cd7549d2..778675b72f 100644
--- a/src/Umbraco.Core/Logging/LoggerExtensions.cs
+++ b/src/Umbraco.Core/Logging/LoggerExtensions.cs
@@ -126,6 +126,29 @@ namespace Umbraco.Core.Logging
{
logger.Debug(typeof(T), messageTemplate, propertyValues);
}
-
+
+ ///
+ /// Logs a verbose message.
+ ///
+ /// The reporting type.
+ /// The logger.
+ /// A message.
+ public static void Verbose(this ILogger logger, string message)
+ {
+ logger.Verbose(typeof(T), message);
+ }
+
+ ///
+ /// Logs a Verbose message.
+ ///
+ /// The reporting type
+ /// The logger.
+ /// A structured message template
+ /// Message property values
+ public static void Verbose(this ILogger logger, string messageTemplate, params object[] propertyValues)
+ {
+ logger.Verbose(typeof(T), messageTemplate, propertyValues);
+ }
+
}
}