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

Finish aligning ILogger to MS ILogger

Browse Source
This commit is contained in:
Nikolaj
2020-09-14 14:25:59 +02:00
parent 161061dbbc
commit 5e17aa3bf1
19 changed files with 75 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Umbraco.Core/Logging/ConsoleLogger.cs
View File

@@ -59,34 +59,19 @@ namespace Umbraco.Core.Logging
Console.WriteLine(exception);
}
public void Info(Type reporting, string messageTemplate, params object[] propertyValues)
public void LogInformation(string messageTemplate, params object[] propertyValues)
{
Console.WriteLine("INFO {0} - {1}", reporting.Name, _messageTemplates.Render(messageTemplate, propertyValues));
Console.WriteLine("INFO {0} - {1}", typeof(T).Name, _messageTemplates.Render(messageTemplate, propertyValues));
}
public void Info(Type reporting, string message)
public void LogDebug(string messageTemplate, params object[] propertyValues)
{
Console.WriteLine("INFO {0} - {1}", reporting.Name, message);
Console.WriteLine("DEBUG {0} - {1}", typeof(T).Name, _messageTemplates.Render(messageTemplate, propertyValues));
}
public void Debug(Type reporting, string message)
public void LogTrace(string messageTemplate, params object[] propertyValues)
{
Console.WriteLine("DEBUG {0} - {1}", reporting.Name, message);
}
public void Debug(Type reporting, string messageTemplate, params object[] propertyValues)
{
Console.WriteLine("DEBUG {0} - {1}", reporting.Name, _messageTemplates.Render(messageTemplate, propertyValues));
}
public void Verbose(Type reporting, string message)
{
Console.WriteLine("VERBOSE {0} - {1}", reporting.Name, message);
}
public void Verbose(Type reporting, string messageTemplate, params object[] propertyValues)
{
Console.WriteLine("VERBOSE {0} - {1}", reporting.Name, _messageTemplates.Render(messageTemplate, propertyValues));
Console.WriteLine("VERBOSE {0} - {1}", typeof(T).Name, _messageTemplates.Render(messageTemplate, propertyValues));
}
}
}

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

@@ -66,39 +66,21 @@ namespace Umbraco.Core.Logging
}
/// <inheritdoc/>
public void Info(Type reporting, string message)
public void LogInformation(string messageTemplate, params object[] propertyValues)
{
System.Diagnostics.Debug.WriteLine(message, reporting.FullName);
System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues), typeof(T).FullName);
}
/// <inheritdoc/>
public void Info(Type reporting, string messageTemplate, params object[] propertyValues)
public void LogDebug(string messageTemplate, params object[] propertyValues)
{
System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues), reporting.FullName);
System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues), typeof(T).FullName);
}
/// <inheritdoc/>
public void Debug(Type reporting, string message)
public void LogTrace(string messageTemplate, params object[] propertyValues)
{
System.Diagnostics.Debug.WriteLine(message, reporting.FullName);
}
/// <inheritdoc/>
public void Debug(Type reporting, string messageTemplate, params object[] propertyValues)
{
System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues), reporting.FullName);
}
/// <inheritdoc/>
public void Verbose(Type reporting, string message)
{
System.Diagnostics.Debug.WriteLine(message, reporting.FullName);
}
/// <inheritdoc/>
public void Verbose(Type reporting, string messageTemplate, params object[] propertyValues)
{
System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues), reporting.FullName);
System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues), typeof(T).FullName);
}
}
}

8
src/Umbraco.Core/Logging/DisposableTimer.cs
View File

@@ -37,10 +37,10 @@ namespace Umbraco.Core.Logging
switch (_level)
{
case LogLevel.Debug:
logger.Debug(loggerType, "{StartMessage} [Timing {TimingId}]", startMessage, _timingId);
logger.Debug("{StartMessage} [Timing {TimingId}]", startMessage, _timingId);
break;
case LogLevel.Information:
logger.Info(loggerType, "{StartMessage} [Timing {TimingId}]", startMessage, _timingId);
logger.Info("{StartMessage} [Timing {TimingId}]", startMessage, _timingId);
break;
default:
throw new ArgumentOutOfRangeException(nameof(level));
@@ -89,10 +89,10 @@ namespace Umbraco.Core.Logging
else switch (_level)
{
case LogLevel.Debug:
_logger.Debug(_loggerType, "{EndMessage} ({Duration}ms) [Timing {TimingId}]", _endMessage, Stopwatch.ElapsedMilliseconds, _timingId);
_logger.Debug("{EndMessage} ({Duration}ms) [Timing {TimingId}]", _endMessage, Stopwatch.ElapsedMilliseconds, _timingId);
break;
case LogLevel.Information:
_logger.Info(_loggerType, "{EndMessage} ({Duration}ms) [Timing {TimingId}]", _endMessage, Stopwatch.ElapsedMilliseconds, _timingId);
_logger.Info("{EndMessage} ({Duration}ms) [Timing {TimingId}]", _endMessage, Stopwatch.ElapsedMilliseconds, _timingId);
break;
// filtered in the ctor
//default:

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

@@ -69,49 +69,25 @@ namespace Umbraco.Core.Logging
/// <param name="propertyValues">Property values.</param>
void LogWarning(Exception exception, string messageTemplate, params object[] propertyValues);
/// <summary>
/// Logs an information message.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="message">A message.</param>
void Info(Type reporting, string message);
/// <summary>
/// Logs a info message.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
void Info(Type reporting, string messageTemplate, params object[] propertyValues);
/// <summary>
/// Logs a debugging message.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="message">A message.</param>
void Debug(Type reporting, string message);
void LogInformation(string messageTemplate, params object[] propertyValues);
/// <summary>
/// Logs a debug message.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
void Debug(Type reporting, string messageTemplate, params object[] propertyValues);
void LogDebug(string messageTemplate, params object[] propertyValues);
/// <summary>
/// Logs a verbose message.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="message">A message.</param>
void Verbose(Type reporting, string message);
/// <summary>
/// Logs a verbose message.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
void Verbose(Type reporting, string messageTemplate, params object[] propertyValues);
void LogTrace(string messageTemplate, params object[] propertyValues);
}
}

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

@@ -103,7 +103,7 @@ namespace Umbraco.Core.Logging
/// <param name="logger">The logger.</param>
/// <param name="message">A message.</param>
public static void Info<T>(this ILogger logger, string message)
=> logger.Info(typeof(T), message);
=> logger.LogInformation(message);
/// <summary>
/// Logs a information message.
@@ -113,7 +113,7 @@ namespace Umbraco.Core.Logging
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
public static void Info<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
=> logger.Info(typeof(T), messageTemplate, propertyValues);
=> logger.LogInformation(messageTemplate, propertyValues);
/// <summary>
/// Logs a debugging message.
@@ -122,7 +122,7 @@ namespace Umbraco.Core.Logging
/// <param name="logger">The logger.</param>
/// <param name="message">A message.</param>
public static void Debug<T>(this ILogger logger, string message)
=> logger.Debug(typeof(T), message);
=> logger.LogDebug(message);
/// <summary>
/// Logs a debugging message.
@@ -132,16 +132,7 @@ namespace Umbraco.Core.Logging
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
public static void Debug<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
=> 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);
=> logger.LogDebug(messageTemplate, propertyValues);
/// <summary>
/// Logs a verbose message.
@@ -151,7 +142,7 @@ namespace Umbraco.Core.Logging
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
public static void Verbose<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
=> logger.Verbose(typeof(T), messageTemplate, propertyValues);
=> logger.LogTrace(messageTemplate, propertyValues);
/// <summary>
/// Logs a fatal message.

12
src/Umbraco.Core/Logging/NullLogger.cs
View File

@@ -46,32 +46,32 @@ namespace Umbraco.Core.Logging
}
public void Info(Type reporting, string message)
public void LogInformation(string message, params object[] propertyValues)
{
}
public void Info(Type reporting, string messageTemplate, params object[] propertyValues)
public void LogInformation(string messageTemplate, params object[] propertyValues)
{
}
public void Debug(Type reporting, string message)
public void LogDebug(string message, params object[] propertyValues)
{
}
public void Debug(Type reporting, string messageTemplate, params object[] propertyValues)
public void LogDebug(string messageTemplate, params object[] propertyValues)
{
}
public void Verbose(Type reporting, string message)
public void LogTrace(string message, params object[] propertyValues)
{
}
public void Verbose(Type reporting, string messageTemplate, params object[] propertyValues)
public void LogTrace(string messageTemplate, params object[] propertyValues)
{
}

24
src/Umbraco.Core/Logging/ProfilingLogger.cs
View File

@@ -85,23 +85,23 @@ namespace Umbraco.Core.Logging
public void LogWarning(Exception exception, string messageTemplate, params object[] propertyValues)
=> Logger.LogWarning(exception, messageTemplate, propertyValues);
public void Info(Type reporting, string message)
=> Logger.Info(reporting, message);
public void LogInformation(string message, params object[] propertyValues)
=> Logger.LogInformation(message, propertyValues);
public void Info(Type reporting, string messageTemplate, params object[] propertyValues)
=> Logger.Info(reporting, messageTemplate, propertyValues);
public void LogInformation(string messageTemplate, params object[] propertyValues)
=> Logger.Info(messageTemplate, propertyValues);
public void Debug(Type reporting, string message)
=> Logger.Debug(reporting, message);
public void LogDebug(string message, params object[] propertyValues)
=> Logger.LogDebug(message, propertyValues);
public void Debug(Type reporting, string messageTemplate, params object[] propertyValues)
=> Logger.Debug(reporting, messageTemplate, propertyValues);
public void LogDebug(string messageTemplate, params object[] propertyValues)
=> Logger.Debug(messageTemplate, propertyValues);
public void Verbose(Type reporting, string message)
=> Logger.Verbose(reporting, message);
public void LogTrace(string message, params object[] propertyValues)
=> Logger.LogTrace(message, propertyValues);
public void Verbose(Type reporting, string messageTemplate, params object[] propertyValues)
=> Logger.Verbose(reporting, messageTemplate, propertyValues);
public void LogTrace(string messageTemplate, params object[] propertyValues)
=> Logger.Verbose(messageTemplate, propertyValues);
#endregion
}

2
src/Umbraco.Core/Templates/HtmlUrlParser.cs
View File

@@ -38,7 +38,7 @@ namespace Umbraco.Web.Templates
{
// find all relative urls (ie. urls that contain ~)
var tags = ResolveUrlPattern.Matches(text);
_logger.Debug(typeof(IOHelper), "After regex: {Duration} matched: {TagsCount}", timer.Stopwatch.ElapsedMilliseconds, tags.Count);
_logger.Debug("After regex: {Duration} matched: {TagsCount}", timer.Stopwatch.ElapsedMilliseconds, tags.Count);
foreach (Match tag in tags)
{
var url = "";

2
src/Umbraco.Core/UriExtensions.cs
View File

@@ -159,7 +159,7 @@ namespace Umbraco.Core
}
catch (ArgumentException)
{
Current.Logger.Debug(typeof(UriExtensions), "Failed to determine if request was client side (invalid chars in path \"{Path}\"?)", url.LocalPath);
Current.Logger.Debug("Failed to determine if request was client side (invalid chars in path \"{Path}\"?)", url.LocalPath);
return false;
}
}