diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultActionSelector.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultActionSelector.cs index 2f68697d2e..3bc8ea8a65 100644 --- a/src/Microsoft.AspNet.Mvc.Core/DefaultActionSelector.cs +++ b/src/Microsoft.AspNet.Mvc.Core/DefaultActionSelector.cs @@ -64,7 +64,7 @@ namespace Microsoft.AspNet.Mvc if (finalMatches == null || finalMatches.Count == 0) { - if (_logger.IsEnabled(TraceType.Verbose)) + if (_logger.IsEnabled(LogLevel.Verbose)) { _logger.WriteValues(new DefaultActionSelectorSelectAsyncValues() { @@ -80,7 +80,7 @@ namespace Microsoft.AspNet.Mvc { var selectedAction = finalMatches[0]; - if (_logger.IsEnabled(TraceType.Verbose)) + if (_logger.IsEnabled(LogLevel.Verbose)) { _logger.WriteValues(new DefaultActionSelectorSelectAsyncValues() { @@ -95,7 +95,7 @@ namespace Microsoft.AspNet.Mvc } else { - if (_logger.IsEnabled(TraceType.Verbose)) + if (_logger.IsEnabled(LogLevel.Verbose)) { _logger.WriteValues(new DefaultActionSelectorSelectAsyncValues() { diff --git a/src/Microsoft.AspNet.Mvc.Core/Logging/LogFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Logging/LogFormatter.cs index 45fee7a5fe..064c164853 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Logging/LogFormatter.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Logging/LogFormatter.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Mvc.Logging { /// /// A formatter for use with . diff --git a/src/Microsoft.AspNet.Mvc.Core/Logging/LoggerExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Logging/LoggerExtensions.cs index 8b3f06ca55..277501b121 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Logging/LoggerExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Logging/LoggerExtensions.cs @@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Mvc.Logging public static void WriteValues([NotNull] this ILogger logger, object values) { logger.Write( - eventType: TraceType.Verbose, + logLevel: LogLevel.Verbose, eventId: 0, state: values, exception: null, diff --git a/src/Microsoft.AspNet.Mvc.Core/MvcRouteHandler.cs b/src/Microsoft.AspNet.Mvc.Core/MvcRouteHandler.cs index b6a7406555..b5d28e6631 100644 --- a/src/Microsoft.AspNet.Mvc.Core/MvcRouteHandler.cs +++ b/src/Microsoft.AspNet.Mvc.Core/MvcRouteHandler.cs @@ -52,7 +52,7 @@ namespace Microsoft.AspNet.Mvc if (actionDescriptor == null) { - if (_logger.IsEnabled(TraceType.Verbose)) + if (_logger.IsEnabled(LogLevel.Verbose)) { _logger.WriteValues(new MvcRouteHandlerRouteAsyncValues() { @@ -96,7 +96,7 @@ namespace Microsoft.AspNet.Mvc // tacking on extra data on the exception?) ex.Data.Add("AD", actionDescriptor); - if (_logger.IsEnabled(TraceType.Verbose)) + if (_logger.IsEnabled(LogLevel.Verbose)) { _logger.WriteValues(new MvcRouteHandlerRouteAsyncValues() { @@ -112,7 +112,7 @@ namespace Microsoft.AspNet.Mvc await invoker.InvokeAsync(); context.IsHandled = true; - if (_logger.IsEnabled(TraceType.Verbose)) + if (_logger.IsEnabled(LogLevel.Verbose)) { _logger.WriteValues(new MvcRouteHandlerRouteAsyncValues() { diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRoute.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRoute.cs index 0c0a5d5cce..6769ea67a5 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRoute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRoute.cs @@ -104,7 +104,7 @@ namespace Microsoft.AspNet.Mvc.Routing } } - if (_logger.IsEnabled(TraceType.Verbose)) + if (_logger.IsEnabled(LogLevel.Verbose)) { _logger.WriteValues(new AttributeRouteRouteAsyncValues() { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Logging/NullLogger.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Logging/NullLogger.cs index 17c68b7981..c1416d132e 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Logging/NullLogger.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Logging/NullLogger.cs @@ -15,11 +15,11 @@ namespace Microsoft.AspNet.Mvc return NullDisposable.Instance; } - public void Write(TraceType eventType, int eventId, object state, Exception exception, Func formatter) + public void Write(LogLevel logLevel, int eventId, object state, Exception exception, Func formatter) { } - public bool IsEnabled(TraceType eventType) + public bool IsEnabled(LogLevel logLevel) { return false; } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Logging/TestLogger.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Logging/TestLogger.cs index 68110ae682..591de4bb5b 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Logging/TestLogger.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Logging/TestLogger.cs @@ -33,11 +33,11 @@ namespace Microsoft.AspNet.Mvc return NullDisposable.Instance; } - public void Write(TraceType eventType, int eventId, object state, Exception exception, Func formatter) + public void Write(LogLevel logLevel, int eventId, object state, Exception exception, Func formatter) { _sink.Write(new WriteContext() { - EventType = eventType, + LogLevel = logLevel, EventId = eventId, State = state, Exception = exception, @@ -47,7 +47,7 @@ namespace Microsoft.AspNet.Mvc }); } - public bool IsEnabled(TraceType eventType) + public bool IsEnabled(LogLevel logLevel) { return true; } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Logging/WriteContext.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Logging/WriteContext.cs index a8b0ff291c..354a0340b2 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Logging/WriteContext.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Logging/WriteContext.cs @@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Mvc { public class WriteContext { - public TraceType EventType { get; set; } + public LogLevel LogLevel { get; set; } public int EventId { get; set; } diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/NullLoggerFactory.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/NullLoggerFactory.cs index 02930abcf3..22af435de9 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/NullLoggerFactory.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/NullLoggerFactory.cs @@ -27,11 +27,11 @@ namespace Microsoft.AspNet.Mvc return NullDisposable.Instance; } - public void Write(TraceType eventType, int eventId, object state, Exception exception, Func formatter) + public void Write(LogLevel logLevel, int eventId, object state, Exception exception, Func formatter) { } - public bool IsEnabled(TraceType eventType) + public bool IsEnabled(LogLevel logLevel) { return false; }