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

Remove exception logging and finish LogWarning

Browse Source
This commit is contained in:
Nikolaj
2020-09-14 14:10:19 +02:00
parent db4652c0be
commit 161061dbbc
31 changed files with 84 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Composing/TypeFinder.cs
View File

@@ -297,7 +297,7 @@ namespace Umbraco.Core.Composing
}
catch (TypeLoadException ex)
{
_logger.LogError(typeof(TypeFinder), ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
_logger.LogError(ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
continue;
}
@@ -372,7 +372,7 @@ namespace Umbraco.Core.Composing
}
catch (TypeLoadException ex)
{
_logger.LogError(typeof(TypeFinder), ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
_logger.LogError(ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
continue;
}
@@ -442,7 +442,7 @@ namespace Umbraco.Core.Composing
if (_notifiedLoadExceptionAssemblies.Contains(a.FullName) == false)
{
_notifiedLoadExceptionAssemblies.Add(a.FullName);
_logger.LogWarning(typeof (TypeFinder), ex, "Could not load all types from {TypeName}.", a.GetName().Name);
_logger.LogWarning(ex, "Could not load all types from {TypeName}.", a.GetName().Name);
}
}
return rex.Types.WhereNotNull().ToArray();

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

@@ -31,53 +31,31 @@ namespace Umbraco.Core.Logging
Console.WriteLine("FATAL {0} - {1}", typeof(T).Name, _messageTemplates.Render(messageTemplate, propertyValues));
}
public void LogError(Type reporting, Exception exception, string message)
{
Console.WriteLine("ERROR {0} - {1}", reporting.Name, message);
Console.WriteLine(exception);
}
public void LogError(Type reporting, Exception exception)
{
Console.WriteLine("ERROR {0}", reporting.Name);
Console.WriteLine(exception);
}
public void LogError(Type reporting, string message)
public void LogError(Exception exception, string messageTemplate, params object[] propertyValues)
{
Console.WriteLine("ERROR {0} - {1}", reporting.Name, message);
}
public void LogError(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
{
Console.WriteLine("ERROR {0} - {1}", reporting.Name, _messageTemplates.Render(messageTemplate, propertyValues));
Console.WriteLine("ERROR {0} - {1}", typeof(T).Name, _messageTemplates.Render(messageTemplate, propertyValues));
Console.WriteLine(exception);
}
public void LogError(Type reporting, string messageTemplate, params object[] propertyValues)
public void LogError(string messageTemplate, params object[] propertyValues)
{
Console.WriteLine("ERROR {0} - {1}", reporting.Name, _messageTemplates.Render(messageTemplate, propertyValues));
Console.WriteLine("ERROR {0} - {1}", typeof(T).Name, _messageTemplates.Render(messageTemplate, propertyValues));
}
public void LogWarning(Type reporting, string message)
public void LogWarning(string message, params object[] propertyValues)
{
Console.WriteLine("WARN {0} - {1}", reporting.Name, message);
Console.WriteLine("WARN {0} - {1}", typeof(T).Name, _messageTemplates.Render(message, propertyValues));
}
public void LogWarning(Type reporting, string message, params object[] propertyValues)
public void LogWarning(Exception exception, string message, params object[] propertyValues)
{
Console.WriteLine("WARN {0} - {1}", reporting.Name, _messageTemplates.Render(message, propertyValues));
}
public void LogWarning(Type reporting, Exception exception, string message)
{
Console.WriteLine("WARN {0} - {1}", reporting.Name, message);
Console.WriteLine(exception);
}
public void LogWarning(Type reporting, Exception exception, string message, params object[] propertyValues)
{
Console.WriteLine("WARN {0} - {1}", reporting.Name, _messageTemplates.Render(message, propertyValues));
Console.WriteLine("WARN {0} - {1}", typeof(T).Name, _messageTemplates.Render(message, propertyValues));
Console.WriteLine(exception);
}

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

@@ -35,12 +35,6 @@ namespace Umbraco.Core.Logging
System.Diagnostics.Debug.WriteLine(messageTemplate, propertyValues);
}
/// <inheritdoc/>
public void LogError(Type reporting, Exception exception, string message)
{
System.Diagnostics.Debug.WriteLine(message + Environment.NewLine + exception, reporting.FullName);
}
/// <inheritdoc/>
public void LogError(Type reporting, Exception exception)
{
@@ -48,45 +42,27 @@ namespace Umbraco.Core.Logging
}
/// <inheritdoc/>
public void LogError(Type reporting, string message)
public void LogError(Exception exception, string messageTemplate, params object[] propertyValues)
{
System.Diagnostics.Debug.WriteLine(message);
System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues) + Environment.NewLine + exception, typeof(T).FullName);
}
/// <inheritdoc/>
public void LogError(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
{
System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues) + Environment.NewLine + exception, reporting.FullName);
}
/// <inheritdoc/>
public void LogError(Type reporting, string messageTemplate, params object[] propertyValues)
public void LogError(string messageTemplate, params object[] propertyValues)
{
System.Diagnostics.Debug.WriteLine(messageTemplate, propertyValues);
}
/// <inheritdoc/>
public void LogWarning(Type reporting, string message)
public void LogWarning(string message, params object[] propertyValues)
{
System.Diagnostics.Debug.WriteLine(message, reporting.FullName);
System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(message, propertyValues), typeof(T).FullName);
}
/// <inheritdoc/>
public void LogWarning(Type reporting, string message, params object[] propertyValues)
public void LogWarning(Exception exception, string message, params object[] propertyValues)
{
System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(message, propertyValues), reporting.FullName);
}
/// <inheritdoc/>
public void LogWarning(Type reporting, Exception exception, string message)
{
System.Diagnostics.Debug.WriteLine(message + Environment.NewLine + exception, reporting.FullName);
}
/// <inheritdoc/>
public void LogWarning(Type reporting, Exception exception, string message, params object[] propertyValues)
{
System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(message + Environment.NewLine + exception, propertyValues), reporting.FullName);
System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(message + Environment.NewLine + exception, propertyValues), typeof(T).FullName);
}
/// <inheritdoc/>

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

@@ -84,7 +84,7 @@ namespace Umbraco.Core.Logging
{
if (_failed)
{
_logger.LogError(_loggerType, _failException, "{FailMessage} ({Duration}ms) [Timing {TimingId}]", _failMessage, Stopwatch.ElapsedMilliseconds, _timingId);
_logger.LogError(_failException, "{FailMessage} ({Duration}ms) [Timing {TimingId}]", _failMessage, Stopwatch.ElapsedMilliseconds, _timingId);
}
else switch (_level)
{

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

@@ -3,7 +3,7 @@
namespace Umbraco.Core.Logging
{
public interface ILogger : ILogger<object>{}
public interface ILogger : ILogger<object> { }
/// <summary>
/// Defines the logging service.
@@ -24,14 +24,6 @@ namespace Umbraco.Core.Logging
/// <param name="level">The level.</param>
bool IsEnabled(Type reporting, LogLevel level);
/// <summary>
/// Logs a fatal exception.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="exception">An exception.</param>
/// <remarks>The message string is unspecified and is implementation-specific.</remarks>
void Fatal(Type reporting, Exception exception);
/// <summary>
/// Logs a fatal message with an exception.
/// </summary>
@@ -50,74 +42,32 @@ namespace Umbraco.Core.Logging
/// <summary>
/// Logs an error message with an exception.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="exception">An exception.</param>
/// <param name="message">A message.</param>
void LogError(Type reporting, Exception exception, string message);
/// <summary>
/// Logs an error exception.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="exception">An exception.</param>
/// <remarks>The message string is unspecified and is implementation-specific.</remarks>
void LogError(Type reporting, Exception exception);
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
void LogError(Exception exception, string messageTemplate, params object[] propertyValues);
/// <summary>
/// Logs an error message.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="message">A message.</param>
void LogError(Type reporting, string message);
/// <summary>
/// Logs an error message with an exception.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="exception">An exception.</param>
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
void LogError(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues);
/// <summary>
/// Logs an error message.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
void LogError(Type reporting, string messageTemplate, params object[] propertyValues);
void LogError(string messageTemplate, params object[] propertyValues);
/// <summary>
/// Logs a warning message.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="message">A message.</param>
void LogWarning(Type reporting, string message);
/// <summary>
/// Logs a warning message.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
void LogWarning(Type reporting, string messageTemplate, params object[] propertyValues);
void LogWarning(string messageTemplate, params object[] propertyValues);
/// <summary>
/// Logs a warning message with an exception.
/// </summary>
/// <param name="reporting">The reporting type.</param>
/// <param name="exception">An exception.</param>
/// <param name="message">A message.</param>
void LogWarning(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="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
void LogWarning(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues);
void LogWarning(Exception exception, string messageTemplate, params object[] propertyValues);
/// <summary>
/// Logs an information message.

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

@@ -24,7 +24,7 @@ namespace Umbraco.Core.Logging
/// <param name="message">A message.</param>
/// <param name="exception">An exception.</param>
public static void LogError<T>(this ILogger logger, Exception exception, string message)
=> logger.LogError(typeof(T), exception, message);
=> logger.LogError(exception, message);
/// <summary>
/// Logs an error message with an exception.
@@ -35,16 +35,7 @@ namespace Umbraco.Core.Logging
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
public static void LogError<T>(this ILogger logger, Exception exception, string messageTemplate, params object[] propertyValues)
=> logger.LogError(typeof(T), exception, messageTemplate, propertyValues);
/// <summary>
/// Logs an error exception.
/// </summary>
/// <typeparam name="T">The reporting type.</typeparam>
/// <param name="logger">The logger.</param>
/// <param name="exception">An exception.</param>
public static void LogError<T>(this ILogger logger, Exception exception)
=> logger.LogError(typeof(T), exception);
=> logger.LogError(exception, messageTemplate, propertyValues);
/// <summary>
/// Logs an error message.
@@ -53,7 +44,7 @@ namespace Umbraco.Core.Logging
/// <param name="logger">The logger.</param>
/// <param name="message">A message.</param>
public static void LogError<T>(this ILogger logger, string message)
=> logger.LogError(typeof(T), message);
=> logger.LogError(message);
/// <summary>
/// Logs an error message.
@@ -63,7 +54,7 @@ namespace Umbraco.Core.Logging
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
public static void LogError<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
=> logger.LogError(typeof(T), messageTemplate, propertyValues);
=> logger.LogError(messageTemplate, propertyValues);
/// <summary>
/// Logs a warning message.
@@ -72,7 +63,7 @@ namespace Umbraco.Core.Logging
/// <param name="logger">The logger.</param>
/// <param name="message">A message.</param>
public static void LogWarning<T>(this ILogger logger, string message)
=> logger.LogWarning(typeof(T), message);
=> logger.LogWarning(message);
/// <summary>
/// Logs a warning message.
@@ -82,7 +73,7 @@ namespace Umbraco.Core.Logging
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
public static void LogWarning<T>(this ILogger logger, string messageTemplate, params object[] propertyValues)
=> logger.LogWarning(typeof(T), messageTemplate, propertyValues);
=> logger.LogWarning(messageTemplate, propertyValues);
/// <summary>
/// Logs a warning message with an exception.
@@ -92,7 +83,7 @@ namespace Umbraco.Core.Logging
/// <param name="exception">An exception.</param>
/// <param name="message">A message.</param>
public static void LogWarning<T>(this ILogger logger, Exception exception, string message)
=> logger.LogWarning(typeof(T), exception, message);
=> logger.LogWarning(exception, message);
/// <summary>
/// Logs a warning message with an exception.
@@ -103,7 +94,7 @@ namespace Umbraco.Core.Logging
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
public static void LogWarning<T>(this ILogger logger, Exception exception, string messageTemplate, params object[] propertyValues)
=> logger.LogWarning(typeof(T), exception, messageTemplate, propertyValues);
=> logger.LogWarning(exception, messageTemplate, propertyValues);
/// <summary>
/// Logs an information message.
@@ -170,7 +161,7 @@ namespace Umbraco.Core.Logging
/// <param name="exception">An exception.</param>
/// <param name="message">A message.</param>
public static void Fatal<T>(this ILogger logger, Exception exception, string message)
=> logger.LogCritical(exception, message, new object[] { });
=> logger.LogCritical(exception, message);
/// <summary>
/// Logs a fatal message.

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

@@ -21,47 +21,27 @@ namespace Umbraco.Core.Logging
}
public void LogError(Type reporting, Exception exception, string message)
{
}
public void LogError(Type reporting, Exception exception)
{
}
public void LogError(Type reporting, string message)
public void LogError(string message, params object[] propertyValues)
{
}
public void LogError(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
public void LogError(Exception exception, string messageTemplate, params object[] propertyValues)
{
}
public void LogError(Type reporting, string messageTemplate, params object[] propertyValues)
public void LogWarning(string messageTemplate, params object[] propertyValues)
{
}
public void LogWarning(Type reporting, string message)
{
}
public void LogWarning(Type reporting, string messageTemplate, params object[] propertyValues)
{
}
public void LogWarning(Type reporting, Exception exception, string message)
{
}
public void LogWarning(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
public void LogWarning(Exception exception, string messageTemplate, params object[] propertyValues)
{
}

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

@@ -67,41 +67,23 @@ namespace Umbraco.Core.Logging
public bool IsEnabled(Type reporting, LogLevel level)
=> Logger.IsEnabled(reporting, level);
public void Fatal(Type reporting, Exception exception)
=> Logger.Fatal(reporting, exception);
public void LogCritical(Exception exception, string messageTemplate, params object[] propertyValues)
=> Logger.LogCritical(exception, messageTemplate, propertyValues);
public void LogCritical(string messageTemplate, params object[] propertyValues)
=> Logger.LogCritical(messageTemplate, propertyValues);
public void LogError(Type reporting, Exception exception, string message)
=> Logger.LogError(reporting, exception, message);
public void LogError(Exception exception, string messageTemplate, params object[] propertyValues)
=> Logger.LogError(exception, messageTemplate, propertyValues);
public void LogError(Type reporting, Exception exception)
=> Logger.LogError(reporting, exception);
public void LogError(string messageTemplate, params object[] propertyValues)
=> Logger.LogError(messageTemplate, propertyValues);
public void LogError(Type reporting, string message)
=> Logger.LogError(reporting, message);
public void LogWarning(string messageTemplate, params object[] propertyValues)
=> Logger.LogWarning(messageTemplate, propertyValues);
public void LogError(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
=> Logger.LogError(reporting, exception, messageTemplate, propertyValues);
public void LogError(Type reporting, string messageTemplate, params object[] propertyValues)
=> Logger.LogError(reporting, messageTemplate, propertyValues);
public void LogWarning(Type reporting, string message)
=> Logger.LogWarning(reporting, message);
public void LogWarning(Type reporting, string messageTemplate, params object[] propertyValues)
=> Logger.LogWarning(reporting, messageTemplate, propertyValues);
public void LogWarning(Type reporting, Exception exception, string message)
=> Logger.LogWarning(reporting, exception, message);
public void LogWarning(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
=> Logger.LogWarning(reporting, exception, messageTemplate, propertyValues);
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);