yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Removes the unused func methods from Logger & DebugDiagnosticsLogger

Browse Source 
* Adds in new Verbose logging level
This commit is contained in:
Warren
2018-08-15 16:39:35 +01:00
parent 95c5817e1e
commit e76d35e2ff
4 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Umbraco.Core/Logging/DebugDiagnosticsLogger.cs
View File

@@ -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);
}

4
src/Umbraco.Core/Logging/ILogger.cs
View File

@@ -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);
}
}

48
src/Umbraco.Core/Logging/Logger.cs
View File

@@ -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);
}
}
}

25
src/Umbraco.Core/Logging/LoggerExtensions.cs
View File

@@ -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);
}
}
}