From 4e5c99fabc6afdc67a181fad2b7d20ec59ab4225 Mon Sep 17 00:00:00 2001 From: Brennan Date: Thu, 21 Jan 2016 09:42:17 -0800 Subject: [PATCH] React to Logging API changes --- src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs | 6 +++--- .../DataStoreErrorLogger.cs | 2 +- .../DatabaseErrorPageMiddleware.cs | 2 +- .../DeveloperExceptionPageMiddleware.cs | 4 ++-- .../ExceptionHandler/ExceptionHandlerMiddleware.cs | 4 ++-- .../Helpers/TestLoggerProvider.cs | 2 +- .../Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs index 0090a693c2..3a82c6caf1 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/ElmLogger.cs @@ -19,8 +19,8 @@ namespace Microsoft.AspNetCore.Diagnostics.Elm _store = store; } - public void Log(LogLevel logLevel, int eventId, object state, Exception exception, - Func formatter) + public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, + Func formatter) { if (!IsEnabled(logLevel) || (state == null && exception == null)) { @@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Diagnostics.Elm { ActivityContext = GetCurrentActivityContext(), Name = _name, - EventID = eventId, + EventID = eventId.Id, Severity = logLevel, Exception = exception, State = state, diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs index 4e9cc0a323..325a8c453f 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs @@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore #endif } - public virtual void Log(LogLevel logLevel, int eventId, [CanBeNull] object state, [CanBeNull] Exception exception, [CanBeNull] Func formatter) + public virtual void Log(LogLevel logLevel, EventId eventId, [CanBeNull] TState state, [CanBeNull] Exception exception, [CanBeNull] Func formatter) { var errorState = state as DatabaseErrorLogState; if (errorState != null && exception != null && LastError != null) diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs index 90cc7ee4c7..a0cf0a58b9 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs @@ -132,7 +132,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore } catch (Exception e) { - _logger.LogError(Strings.DatabaseErrorPageMiddleware_Exception, e); + _logger.LogError(0, e, Strings.DatabaseErrorPageMiddleware_Exception); } throw; diff --git a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs index f5fa008c52..8e42e6ef92 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs @@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Diagnostics } catch (Exception ex) { - _logger.LogError("An unhandled exception has occurred while executing the request", ex); + _logger.LogError(0, ex, "An unhandled exception has occurred while executing the request"); if (context.Response.HasStarted) { @@ -99,7 +99,7 @@ namespace Microsoft.AspNetCore.Diagnostics catch (Exception ex2) { // If there's a Exception while generating the error page, re-throw the original exception. - _logger.LogError("An exception was thrown attempting to display the error page.", ex2); + _logger.LogError(0, ex2, "An exception was thrown attempting to display the error page."); } throw; } diff --git a/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs b/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs index b27d6ec00c..365139cff7 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs +++ b/src/Microsoft.AspNetCore.Diagnostics/ExceptionHandler/ExceptionHandlerMiddleware.cs @@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Diagnostics } catch (Exception ex) { - _logger.LogError("An unhandled exception has occurred: " + ex.Message, ex); + _logger.LogError(0, ex, "An unhandled exception has occurred: " + ex.Message); // We can't do anything if the response has already started, just abort. if (context.Response.HasStarted) { @@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Diagnostics catch (Exception ex2) { // Suppress secondary exceptions, re-throw the original. - _logger.LogError("An exception was thrown attempting to execute the error handler.", ex2); + _logger.LogError(0, ex2, "An exception was thrown attempting to execute the error handler."); } finally { diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/TestLoggerProvider.cs b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/TestLoggerProvider.cs index 86a3d6c284..f8be09de3d 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/TestLoggerProvider.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/Helpers/TestLoggerProvider.cs @@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.H get { return _messages; } } - public void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func formatter) + public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) { _messages.Add(formatter(state, exception)); } diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs index c720cd9251..e5d96ae4e3 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs @@ -52,7 +52,7 @@ namespace Microsoft.AspNetCore.Diagnostics.Tests var store = t.Item2; // Act - logger.Log(LogLevel.Information, 0, null, null, null); + logger.Log(LogLevel.Information, 0, null, null, null); // Assert Assert.Empty(store.GetActivities());