From e76d35e2ff9515fa37137c49533c30e194d95796 Mon Sep 17 00:00:00 2001
From: Warren <warren@umbraco.com>
Date: Wed, 15 Aug 2018 16:39:35 +0100
Subject: [PATCH] * Removes the unused func methods from Logger &
 DebugDiagnosticsLogger * Adds in new Verbose logging level

---
 .../Logging/DebugDiagnosticsLogger.cs         | 33 ++++---------
 src/Umbraco.Core/Logging/ILogger.cs           |  4 ++
 src/Umbraco.Core/Logging/Logger.cs            | 48 +++++++------------
 src/Umbraco.Core/Logging/LoggerExtensions.cs  | 25 +++++++++-
 4 files changed, 55 insertions(+), 55 deletions(-)

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);
         }
-
-        /// <inheritdoc/>
-        public void Warn(Type reporting, Func<string> messageBuilder)
-        {
-            System.Diagnostics.Debug.WriteLine(messageBuilder(), reporting.FullName);
-        }
-
+        
         /// <inheritdoc/>
         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);
         }
 
-        /// <inheritdoc/>
-        public void Warn(Type reporting, Exception exception, Func<string> messageBuilder)
-        {
-            System.Diagnostics.Debug.WriteLine(messageBuilder() + Environment.NewLine + exception, reporting.FullName);
-        }
-
         /// <inheritdoc/>
         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);
         }
 
-        /// <inheritdoc/>
-        public void Info(Type reporting, Func<string> messageBuilder)
-        {
-            System.Diagnostics.Debug.WriteLine(messageBuilder(), reporting.FullName);
-        }
-
         /// <inheritdoc/>
         public void Info(Type reporting, string format, params object[] args)
         {
@@ -81,13 +62,19 @@ namespace Umbraco.Core.Logging
         }
 
         /// <inheritdoc/>
-        public void Debug(Type reporting, Func<string> 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);
         }
 
         /// <inheritdoc/>
-        public void Debug(Type reporting, string format, params object[] args)
+        public void Verbose(Type reporting, string message)
+        {
+            System.Diagnostics.Debug.WriteLine(message, reporting.FullName);
+        }
+
+        /// <inheritdoc/>
+        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
         /// <param name="messageTemplate">The message template that includes property values</param>
         /// <param name="propertyValues">Property values to log & update in message template</param>
         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);
         }
-
-        /// <inheritdoc/>
-        public void Warn(Type reporting, Func<string> messageBuilder)
-        {
-            var logger = Log.Logger;
-            logger?.Warning(messageBuilder());
-        }
-
+        
         /// <inheritdoc/>
         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);
         }
-
-        /// <inheritdoc/>
-        public void Warn(Type reporting, Exception exception, Func<string> messageBuilder)
-        {
-            var logger = Log.Logger;
-            logger?.ForContext(reporting).Warning(messageBuilder(), exception);
-        }
-
+        
         /// <inheritdoc/>
         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);
         }
 
-        /// <inheritdoc/>
-        public void Info(Type reporting, Func<string> generateMessage)
-        {
-            var logger = Log.Logger;
-            logger?.ForContext(reporting).Information(generateMessage());
-        }
-
         /// <inheritdoc/>
         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);
         }
-
-        /// <inheritdoc/>
-        public void Debug(Type reporting, Func<string> messageBuilder)
-        {
-            var logger = Log.Logger;
-            logger?.ForContext(reporting).Debug(messageBuilder());
-        }
-
+        
         /// <inheritdoc/>
         public void Debug(Type reporting, string messageTemplate, params object[] propertyValues)
         {
             var logger = Log.Logger;
             logger?.ForContext(reporting).Debug(messageTemplate, propertyValues);
         }
+
+        /// <inheritdoc/>
+        public void Verbose(Type reporting, string message)
+        {
+            var logger = Log.Logger;
+            logger?.ForContext(reporting).Verbose(message);
+        }
+
+        /// <inheritdoc/>
+        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);
         }
-        
+
+        /// <summary>
+        /// Logs a verbose message.
+        /// </summary>
+        /// <typeparam name="T">The reporting type.</typeparam>
+        /// <param name="logger">The logger.</param>
+        /// <param name="message">A message.</param>
+        public static void Verbose<T>(this ILogger logger, string message)
+        {
+            logger.Verbose(typeof(T), message);
+        }
+
+        /// <summary>
+        /// Logs a Verbose message.
+        /// </summary>
+        /// <typeparam name="T">The reporting type</typeparam>
+        /// <param name="logger">The logger.</param>
+        /// <param name="messageTemplate">A structured message template</param>
+        /// <param name="propertyValues">Message property values</param>
+        public static void Verbose<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
+        {
+            logger.Verbose(typeof(T), messageTemplate, propertyValues);
+        }
+
     }
 }