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

Removes the logging Func from Interface AND updates the only usages

Browse Source 
* UmbracoExamineindexer
* The extension method <T> wrappers
This commit is contained in:
Warren
2018-08-15 15:21:27 +01:00
parent d7c6daac98
commit 95c5817e1e
3 changed files with 49 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,8 +23,7 @@ namespace Umbraco.Core.Logging
/// <param name="exception">An exception.</param>
/// <param name="propertyValues">Property values to log & update in message template</param>
void Error(Type reporting, string messageTemplate, Exception exception = null, params object[] propertyValues);
/// <summary>
/// Logs a warning message.
/// </summary>
@@ -32,13 +31,6 @@ namespace Umbraco.Core.Logging
/// <param name="message">A message.</param>
void Warn(Type reporting, string message);
/// <summary>
/// Logs a warning message.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="messageBuilder">A message builder.</param>
void Warn(Type reporting, Func<string> messageBuilder);
/// <summary>
/// Logs a warning message - using a structured log message
/// </summary>
@@ -55,14 +47,6 @@ namespace Umbraco.Core.Logging
/// <param name="message">A message.</param>
void Warn(Type reporting, Exception exception, string message);
/// <summary>
/// Logs a warning message with an exception.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="exception">An exception.</param>
/// <param name="messageBuilder">A message builder.</param>
void Warn(Type reporting, Exception exception, Func<string> messageBuilder);
/// <summary>
/// Logs a warning message with an exception - using a structured log message
/// </summary>
@@ -79,13 +63,6 @@ namespace Umbraco.Core.Logging
/// <param name="message">A message.</param>
void Info(Type reporting, string message);
/// <summary>
/// Logs an information message.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="messageBuilder">A message builder.</param>
void Info(Type reporting, Func<string> messageBuilder);
/// <summary>
/// Logs a info message - using a structured log message
/// </summary>
@@ -100,14 +77,7 @@ namespace Umbraco.Core.Logging
/// <param name="reporting">The reporting type.</param>
/// <param name="message">A message.</param>
void Debug(Type reporting, string message);
/// <summary>
/// Logs a debugging message.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="messageBuilder">A message builder.</param>
void Debug(Type reporting, Func<string> messageBuilder);
/// <summary>
/// Logs a debug message - using a structured log message
/// </summary>

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

@@ -1,5 +1,4 @@
using System;
using System.Linq;
namespace Umbraco.Core.Logging
{
@@ -21,6 +20,14 @@ namespace Umbraco.Core.Logging
logger.Error(typeof(T), message, exception);
}
/// <summary>
/// Logs a warning 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="exception">An exception</param>
/// <param name="propertyValues">Message property values</param>
public static void Error<T>(this ILogger logger, string messageTemplate, Exception exception = null, params object[] propertyValues)
{
logger.Error(typeof(T), messageTemplate, exception, propertyValues);
@@ -37,34 +44,16 @@ namespace Umbraco.Core.Logging
logger.Warn(typeof(T), message);
}
public static void Warn<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
{
logger.Warn(typeof(T), messageTemplate, propertyValues);
}
/// <summary>
/// Logs a warning message.
/// </summary>
/// <typeparam name="T">The reporting type.</typeparam>
/// <typeparam name="T">The reporting type</typeparam>
/// <param name="logger">The logger.</param>
/// <param name="messageBuilder">A message builder.</param>
[Obsolete("Use the Warn<T> with message template", true)]
public static void Warn<T>(this ILogger logger, Func<string> messageBuilder)
/// <param name="messageTemplate">A structured message template</param>
/// <param name="propertyValues">Message property values</param>
public static void Warn<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
{
logger.Warn(typeof(T), messageBuilder);
}
/// <summary>
/// Logs a formatted warning message with an exception.
/// </summary>
/// <typeparam name="T">The reporting type.</typeparam>
/// <param name="logger">The logger.</param>
/// <param name="exception">An exception.</param>
/// <param name="messageBuilder">A message builder.</param>
[Obsolete("Use the Warn<T> with message template", true)]
public static void Warn<T>(this ILogger logger, Exception exception, Func<string> messageBuilder)
{
logger.Warn(typeof(T), exception, messageBuilder);
logger.Warn(typeof(T), messageTemplate, propertyValues);
}
/// <summary>
@@ -79,6 +68,14 @@ namespace Umbraco.Core.Logging
logger.Warn(typeof(T), exception, message);
}
/// <summary>
/// Logs a warning message.
/// </summary>
/// <typeparam name="T">The reporting type</typeparam>
/// <param name="logger">The logger.</param>
/// <param name="exception">An exception</param>
/// <param name="messageTemplate">A structured message template</param>
/// <param name="propertyValues">Message property values</param>
public static void Warn<T>(this ILogger logger, Exception exception, string messageTemplate, params object[] propertyValues)
{
logger.Warn(typeof(T), exception, messageTemplate, propertyValues);
@@ -95,23 +92,18 @@ namespace Umbraco.Core.Logging
logger.Info(typeof(T), message);
}
/// <summary>
/// Logs a information 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 Info<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
{
logger.Info(typeof(T), messageTemplate, propertyValues);
}
/// <summary>
/// Logs an information message.
/// </summary>
/// <typeparam name="T">The reporting type.</typeparam>
/// <param name="logger">The logger.</param>
/// <param name="messageBuilder">A message builder.</param>
[Obsolete("Use the Info<T> with message template", true)]
public static void Info<T>(this ILogger logger, Func<string> messageBuilder)
{
logger.Info(typeof(T), messageBuilder);
}
/// <summary>
/// Logs a debugging message.
/// </summary>
@@ -123,21 +115,17 @@ namespace Umbraco.Core.Logging
logger.Debug(typeof(T), message);
}
/// <summary>
/// Logs a debugging 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 Debug<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
{
logger.Debug(typeof(T), messageTemplate, propertyValues);
}
/// <summary>
/// Logs a debugging message.
/// </summary>
/// <typeparam name="T">The reporting type.</typeparam>
/// <param name="logger">The logger.</param>
/// <param name="messageBuilder">A message builder.</param>
[Obsolete("Use the Debug<T> with message template", true)]
public static void Debug<T>(this ILogger logger, Func<string> messageBuilder)
{
logger.Debug(typeof(T), messageBuilder);
}
}
}

14
src/Umbraco.Examine/UmbracoExamineIndexer.cs
View File

@@ -162,7 +162,7 @@ namespace Umbraco.Examine
/// </remarks>
public override void Initialize(string name, System.Collections.Specialized.NameValueCollection config)
{
ProfilingLogger.Logger.Debug(GetType(), () => $"{name} indexer initializing");
ProfilingLogger.Logger.Debug(GetType(), "{IndexerName} indexer initializing", name);
if (config["enableDefaultEventHandler"] != null && bool.TryParse(config["enableDefaultEventHandler"], out var enabled))
{
@@ -359,7 +359,12 @@ namespace Umbraco.Examine
}
}
ProfilingLogger.Logger.Debug(GetType(), () => $"Write lucene doc id:{docArgs.ValueSet.Id}, category:{docArgs.ValueSet.Category}, type:{docArgs.ValueSet.ItemType}");
ProfilingLogger.Logger.Debug(GetType(),
"Write lucene doc id:{DocumentId}, category:{DocumentCategory}, type:{DocumentItemType}",
docArgs.ValueSet.Id,
docArgs.ValueSet.Category,
docArgs.ValueSet.ItemType);
base.OnDocumentWriting(docArgs);
}
@@ -369,7 +374,10 @@ namespace Umbraco.Examine
/// </summary>
protected override void AddDocument(Document doc, IndexItem item, IndexWriter writer)
{
ProfilingLogger.Logger.Debug(GetType(), () => $"AddDocument {item.ValueSet.Id} with type {item.ValueSet.ItemType}");
ProfilingLogger.Logger.Debug(GetType(),
"AddDocument {DocumentId} with type {DocumentItemType}",
item.ValueSet.Id,
item.ValueSet.ItemType);
base.AddDocument(doc, item, writer);
}