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

Align fatal exception with message

Browse Source
This commit is contained in:
Nikolaj
2020-09-14 11:49:47 +02:00
parent b8c60d1666
commit db4652c0be
16 changed files with 28 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,21 +14,15 @@ namespace Umbraco.Core.Logging
public bool IsEnabled(Type reporting, LogLevel level)
=> true;
public void Fatal(Type reporting, Exception exception, string message)
{
Console.WriteLine("FATAL {0} - {1}", reporting.Name, message);
Console.WriteLine(exception);
}
public void Fatal(Type reporting, Exception exception)
{
Console.WriteLine("FATAL {0}", reporting.Name);
Console.WriteLine(exception);
}
public void Fatal(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
public void LogCritical(Exception exception, string messageTemplate, params object[] propertyValues)
{
Console.WriteLine("FATAL {0} - {1}", reporting.Name, _messageTemplates.Render(messageTemplate, propertyValues));
Console.WriteLine("FATAL {0} - {1}", typeof(T).Name, _messageTemplates.Render(messageTemplate, propertyValues));
Console.WriteLine(exception);
}

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

@@ -5,7 +5,7 @@ namespace Umbraco.Core.Logging
/// <summary>
/// Implements <see cref="ILogger"/> on top of <see cref="System.Diagnostics"/>.
/// </summary>
public class DebugDiagnosticsLogger : ILogger
public class DebugDiagnosticsLogger<T> : ILogger
{
private readonly IMessageTemplates _messageTemplates;
@@ -17,12 +17,6 @@ namespace Umbraco.Core.Logging
public bool IsEnabled(Type reporting, LogLevel level)
=> true;
/// <inheritdoc/>
public void Fatal(Type reporting, Exception exception, string message)
{
System.Diagnostics.Debug.WriteLine(message + Environment.NewLine + exception, reporting.FullName);
}
/// <inheritdoc/>
public void Fatal(Type reporting, Exception exception)
{
@@ -30,9 +24,9 @@ namespace Umbraco.Core.Logging
}
/// <inheritdoc/>
public void Fatal(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
public void LogCritical(Exception exception, string messageTemplate, params object[] propertyValues)
{
System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues) + Environment.NewLine + exception, reporting.FullName);
System.Diagnostics.Debug.WriteLine(_messageTemplates.Render(messageTemplate, propertyValues) + Environment.NewLine + exception, typeof(T).FullName);
}
/// <inheritdoc/>

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

@@ -24,14 +24,6 @@ namespace Umbraco.Core.Logging
/// <param name="level">The level.</param>
bool IsEnabled(Type reporting, LogLevel level);
/// <summary>
/// Logs a fatal 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 Fatal(Type reporting, Exception exception, string message);
/// <summary>
/// Logs a fatal exception.
/// </summary>
@@ -43,11 +35,10 @@ namespace Umbraco.Core.Logging
/// <summary>
/// Logs a fatal 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 Fatal(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues);
void LogCritical(Exception exception, string messageTemplate, params object[] propertyValues);
/// <summary>
/// Logs a fatal message.

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

@@ -170,7 +170,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.Fatal(typeof(T), exception, message);
=> logger.LogCritical(exception, message, new object[] { });
/// <summary>
/// Logs a fatal message.
@@ -181,6 +181,6 @@ namespace Umbraco.Core.Logging
/// <param name="messageTemplate">A message template.</param>
/// <param name="propertyValues">Property values.</param>
public static void Fatal<T>(this ILogger logger, Exception exception, string messageTemplate, params object[] propertyValues)
=> logger.Fatal(typeof(T), exception, messageTemplate, propertyValues);
=> logger.LogCritical(exception, messageTemplate, propertyValues);
}
}

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

@@ -6,17 +6,12 @@ namespace Umbraco.Core.Logging
{
public bool IsEnabled(Type reporting, LogLevel level) => false;
public void Fatal(Type reporting, Exception exception, string message)
{
}
public void Fatal(Type reporting, Exception exception)
{
}
public void Fatal(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
public void LogCritical(Exception exception, string messageTemplate, params object[] propertyValues)
{
}

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

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

11
src/Umbraco.Infrastructure/Logging/Serilog/SerilogLogger.cs
View File

@@ -80,13 +80,6 @@ namespace Umbraco.Core.Logging.Serilog
public bool IsEnabled(Type reporting, LogLevel level)
=> LoggerFor(reporting).IsEnabled(MapLevel(level));
/// <inheritdoc/>
public void Fatal(Type reporting, Exception exception, string message)
{
var logger = LoggerFor(reporting);
logger.Fatal(exception, message);
}
/// <inheritdoc/>
public void Fatal(Type reporting, Exception exception)
{
@@ -102,9 +95,9 @@ namespace Umbraco.Core.Logging.Serilog
}
/// <inheritdoc/>
public void Fatal(Type reporting, Exception exception, string messageTemplate, params object[] propertyValues)
public void LogCritical(Exception exception, string messageTemplate, params object[] propertyValues)
{
var logger = LoggerFor(reporting);
var logger = LoggerFor(typeof(T));
logger.Fatal(exception, messageTemplate, propertyValues);
}

2
src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs
View File

@@ -60,7 +60,7 @@ namespace Umbraco.Tests.Composing
private static IProfilingLogger GetTestProfilingLogger()
{
var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var profiler = new TestProfiler();
return new ProfilingLogger(logger, profiler);
}

10
src/Umbraco.Tests/Migrations/AdvancedMigrationTests.cs
View File

@@ -21,7 +21,7 @@ namespace Umbraco.Tests.Migrations
[Test]
public void CreateTableOfTDto()
{
var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var builder = Mock.Of<IMigrationBuilder>();
Mock.Get(builder)
@@ -53,7 +53,7 @@ namespace Umbraco.Tests.Migrations
[Test]
public void DeleteKeysAndIndexesOfTDto()
{
var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var builder = Mock.Of<IMigrationBuilder>();
Mock.Get(builder)
@@ -87,7 +87,7 @@ namespace Umbraco.Tests.Migrations
[Test]
public void CreateKeysAndIndexesOfTDto()
{
var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var builder = Mock.Of<IMigrationBuilder>();
Mock.Get(builder)
@@ -124,7 +124,7 @@ namespace Umbraco.Tests.Migrations
[Test]
public void CreateKeysAndIndexes()
{
var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var builder = Mock.Of<IMigrationBuilder>();
Mock.Get(builder)
@@ -161,7 +161,7 @@ namespace Umbraco.Tests.Migrations
[Test]
public void CreateColumn()
{
var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var builder = Mock.Of<IMigrationBuilder>();
Mock.Get(builder)

2
src/Umbraco.Tests/Models/ContentTests.cs
View File

@@ -237,7 +237,7 @@ namespace Umbraco.Tests.Models
private static IProfilingLogger GetTestProfilingLogger()
{
var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var profiler = new TestProfiler();
return new ProfilingLogger(logger, profiler);
}

2
src/Umbraco.Tests/Persistence/NPocoTests/NPocoBulkInsertTests.cs
View File

@@ -27,7 +27,7 @@ namespace Umbraco.Tests.Persistence.NPocoTests
// create the db
// prob not what we want, this is not a real database, but hey, the test is ignored anyways
// we'll fix this when we have proper testing infrastructure
var dbSqlServer = TestObjects.GetUmbracoSqlServerDatabase(new DebugDiagnosticsLogger(new MessageTemplates()));
var dbSqlServer = TestObjects.GetUmbracoSqlServerDatabase(new DebugDiagnosticsLogger<object>(new MessageTemplates()));
//drop the table
dbSqlServer.Execute("DROP TABLE [umbracoServer]");

4
src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
View File

@@ -70,7 +70,7 @@ namespace Umbraco.Tests.Runtimes
Assert.IsTrue(TestComponent.Ctored);
Assert.IsNotNull(TestComponent.ProfilingLogger);
Assert.IsInstanceOf<ProfilingLogger>(TestComponent.ProfilingLogger);
Assert.IsInstanceOf<DebugDiagnosticsLogger>(((ProfilingLogger) TestComponent.ProfilingLogger).Logger);
Assert.IsInstanceOf<DebugDiagnosticsLogger<object>>(((ProfilingLogger) TestComponent.ProfilingLogger).Logger);
// note: components are NOT disposed after boot
@@ -88,7 +88,7 @@ namespace Umbraco.Tests.Runtimes
{
}
private static readonly DebugDiagnosticsLogger _logger = new DebugDiagnosticsLogger(new MessageTemplates());
private static readonly DebugDiagnosticsLogger<object> _logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
private static readonly IIOHelper _ioHelper = TestHelper.IOHelper;
private static readonly IProfiler _profiler = new TestProfiler();
private static readonly Configs _configs = GetConfigs();

4
src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests2.cs
View File

@@ -21,7 +21,7 @@ namespace Umbraco.Tests.Scheduling
[Timeout(4000)]
public async Task ThreadResumeIssue()
{
var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions { KeepAlive = true, LongRunning = true }, logger, TestHelper.GetHostingEnvironmentLifetime());
var work = new ThreadResumeIssueWorkItem();
runner.Add(work);
@@ -76,7 +76,7 @@ namespace Umbraco.Tests.Scheduling
[Ignore("Only runs in the debugger.")]
public async Task DebuggerInterferenceIssue()
{
var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var runner = new BackgroundTaskRunner<IBackgroundTask>(new BackgroundTaskRunnerOptions { KeepAlive = true, LongRunning = true }, logger, TestHelper.GetHostingEnvironmentLifetime());
var taskCompleted = false;
runner.TaskCompleted += (sender, args) =>

2
src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
View File

@@ -65,7 +65,7 @@ namespace Umbraco.Tests.Services
private static IProfilingLogger GetTestProfilingLogger()
{
var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var profiler = new TestProfiler();
return new ProfilingLogger(logger, profiler);
}

2
src/Umbraco.Tests/Services/PerformanceTests.cs
View File

@@ -58,7 +58,7 @@ namespace Umbraco.Tests.Services
private static IProfilingLogger GetTestProfilingLogger()
{
var logger = new DebugDiagnosticsLogger(new MessageTemplates());
var logger = new DebugDiagnosticsLogger<object>(new MessageTemplates());
var profiler = new TestProfiler();
return new ProfilingLogger(logger, profiler);
}

2
src/Umbraco.Web/Logging/OwinLogger.cs
View File

@@ -27,7 +27,7 @@ namespace Umbraco.Web.Logging
switch (eventType)
{
case TraceEventType.Critical:
_logger.Fatal(_type.Value, exception, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
_logger.LogCritical(exception, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);
return true;
case TraceEventType.Error:
_logger.LogError(_type.Value, exception, "[{EventType}] Event Id: {EventId}, State: {State}", eventType, eventId, state);