diff --git a/src/Microsoft.AspNet.Mvc.Core/Logging/ControllerActionInvokerLoggerExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Logging/ControllerActionInvokerLoggerExtensions.cs index 55cb700233..cbbb4b5a6d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Logging/ControllerActionInvokerLoggerExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Logging/ControllerActionInvokerLoggerExtensions.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.Logging "Executing action method {ActionName} with arguments ({Arguments}) - ModelState is {ValidationState}'"); _actionMethodExecuted = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 2, "Executed action method {ActionName}, returned result {ActionResult}.'"); } diff --git a/src/Microsoft.AspNet.Mvc.Core/Logging/DefaultActionSelectorLoggerExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Logging/DefaultActionSelectorLoggerExtensions.cs index c8c14dd056..fe30863d1d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Logging/DefaultActionSelectorLoggerExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Logging/DefaultActionSelectorLoggerExtensions.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Mvc.Logging 1, "Request matched multiple actions resulting in ambiguity. Matching actions: {AmbiguousActions}"); _constraintMismatch = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 2, "Action '{ActionName}' with id '{ActionId}' did not match the constraint '{ActionConstraint}'"); } diff --git a/src/Microsoft.AspNet.Mvc.Core/Logging/FilterActionInvokerLoggerExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Logging/FilterActionInvokerLoggerExtensions.cs index 663473c4bf..3f3a9e6ae8 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Logging/FilterActionInvokerLoggerExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Logging/FilterActionInvokerLoggerExtensions.cs @@ -21,15 +21,15 @@ namespace Microsoft.AspNet.Mvc.Logging 1, "Authorization failed for the request at filter '{AuthorizationFilter}'."); _resourceFilterShortCircuit = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 2, "Request was short circuited at resource filter '{ResourceFilter}'."); _actionFilterShortCircuit = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 3, "Request was short circuited at action filter '{ActionFilter}'."); _exceptionFilterShortCircuit = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 4, "Request was short circuited at exception filter '{ExceptionFilter}'."); } diff --git a/src/Microsoft.AspNet.Mvc.Core/Logging/MvcRouteHandlerLoggerExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Logging/MvcRouteHandlerLoggerExtensions.cs index 4d7472d649..6ad08e96d9 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Logging/MvcRouteHandlerLoggerExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Logging/MvcRouteHandlerLoggerExtensions.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.Logging static MvcRouteHandlerLoggerExtensions() { _actionExecuting = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 1, "Executing action {ActionName}"); @@ -44,7 +44,7 @@ namespace Microsoft.AspNet.Mvc.Logging public static void NoActionsMatched(this ILogger logger) { - logger.LogVerbose(3, "No actions matched the current request"); + logger.LogDebug(3, "No actions matched the current request"); } private class ActionLogScope : ILogValues diff --git a/src/Microsoft.AspNet.Mvc.Core/Logging/ObjectResultExecutorLoggerExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Logging/ObjectResultExecutorLoggerExtensions.cs index 9f3e075fbc..ec968c0f65 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Logging/ObjectResultExecutorLoggerExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Logging/ObjectResultExecutorLoggerExtensions.cs @@ -29,19 +29,19 @@ namespace Microsoft.AspNet.Mvc.Logging 1, "Executing ObjectResult, writing value {Value}."); _formatterSelected = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 2, "Selected output formatter '{OutputFormatter}' and content type '{ContentType}' to write the response."); _skippedContentNegotiation = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 3, "Skipped content negotiation as content type '{ContentType}' is explicitly set for the response."); _noAcceptForNegotiation = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 4, "No information found on request to perform content negotiation."); _noFormatterFromNegotiation = LoggerMessage.Define>( - LogLevel.Verbose, + LogLevel.Debug, 5, "Could not find an output formatter based on content negotiation. Accepted types were ({AcceptTypes})"); } diff --git a/src/Microsoft.AspNet.Mvc.Core/Logging/ViewResultExecutorLoggerExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Logging/ViewResultExecutorLoggerExtensions.cs index 5bbe355a12..543c2590a8 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Logging/ViewResultExecutorLoggerExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Logging/ViewResultExecutorLoggerExtensions.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Mvc.Logging static ViewResultExecutorLoggerExtensions() { _viewFound = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 1, "The view '{ViewName}' was found."); _viewNotFound = LoggerMessage.Define>( diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/Logging/JsonInputFormatterLoggerExtensions.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/Logging/JsonInputFormatterLoggerExtensions.cs index f7125030b7..bd72d65a8e 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Json/Logging/JsonInputFormatterLoggerExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/Logging/JsonInputFormatterLoggerExtensions.cs @@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Json.Logging static JsonInputFormatterLoggerExtensions() { _jsonInputFormatterCrashed = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 1, "JSON input formatter threw an exception."); } diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/Logging/ModeMatchResultLoggerExtensions.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/Logging/ModeMatchResultLoggerExtensions.cs index 7192dd08ad..1ac481774f 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/Logging/ModeMatchResultLoggerExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/Logging/ModeMatchResultLoggerExtensions.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Logging static ModeMatchResultLoggerExtensions() { _skippingProcessing = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 1, "Skipping processing for tag helper '{TagHelper}' with id '{TagHelperId}'."); } @@ -63,7 +63,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Logging logger.LogWarning(logValues); } - if (logger.IsEnabled(LogLevel.Verbose) && modeMatchResult.FullMatches.Count == 0) + if (logger.IsEnabled(LogLevel.Debug) && modeMatchResult.FullMatches.Count == 0) { _skippingProcessing(logger, tagHelper, uniqueId, null); } diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/DefaultViewComponentInvokerLoggerExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/DefaultViewComponentInvokerLoggerExtensions.cs index f7ada1bf32..9941109716 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/DefaultViewComponentInvokerLoggerExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/DefaultViewComponentInvokerLoggerExtensions.cs @@ -16,12 +16,12 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures.Logging static DefaultViewComponentInvokerLoggerExtensions() { _viewComponentExecuting = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 1, "Executing view component {ViewComponentName}"); _viewComponentExecuted = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 2, "Executed view component {ViewComponentName} in {ElapsedMilliseconds}ms and returned " + "{ViewComponentResult}"); diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/PartialViewResultExecutorLoggerExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/PartialViewResultExecutorLoggerExtensions.cs index 27ac11c921..8989d9ed56 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/PartialViewResultExecutorLoggerExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/PartialViewResultExecutorLoggerExtensions.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures.Logging 1, "Executing PartialViewResult, running view at path {Path}."); _partialViewFound = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 2, "The partial view '{PartialViewName}' was found."); _partialViewNotFound = LoggerMessage.Define>( diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/ViewResultExecutorLoggerExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/ViewResultExecutorLoggerExtensions.cs index 19ce4be642..2abe623439 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/ViewResultExecutorLoggerExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/ViewResultExecutorLoggerExtensions.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.Logging 1, "Executing ViewResult, running view at path {Path}."); _viewFound = LoggerMessage.Define( - LogLevel.Verbose, + LogLevel.Debug, 2, "The view '{ViewName}' was found."); _viewNotFound = LoggerMessage.Define>( diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/Internal/ModeMatchResultTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/Internal/ModeMatchResultTest.cs index df4739d361..33dea57973 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/Internal/ModeMatchResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/Internal/ModeMatchResultTest.cs @@ -13,11 +13,11 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Internal public class ModeMatchResultTest { [Fact] - public void LogDetails_LogsVerboseWhenNoFullMatchesFound() + public void LogDetails_LogsDebugWhenNoFullMatchesFound() { // Arrange var modeMatchResult = new ModeMatchResult(); - var logger = MakeLogger(LogLevel.Verbose); + var logger = MakeLogger(LogLevel.Debug); var tagHelper = new Mock(); var uniqueId = "id"; var viewPath = "Views/Home/Index.cshtml"; @@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Internal // Assert Mock.Get(logger).Verify(l => l.Log( - LogLevel.Verbose, + LogLevel.Debug, It.IsAny(), It.IsAny(), It.IsAny(), @@ -43,7 +43,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Internal ModeMatchAttributes.Create("mode0", new[] { "first-attr" })); modeMatchResult.PartialMatches.Add( ModeMatchAttributes.Create("mode1", new[] { "first-attr" }, new[] { "second-attr" })); - var logger = MakeLogger(LogLevel.Verbose); + var logger = MakeLogger(LogLevel.Debug); var tagHelper = new Mock(); var uniqueId = "id"; var viewPath = "Views/Home/Index.cshtml"; @@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Internal It.IsAny(), It.IsAny>()), Times.Never); Mock.Get(logger).Verify(l => l.Log( - LogLevel.Verbose, + LogLevel.Debug, It.IsAny(), It.IsAny(), It.IsAny(), @@ -74,7 +74,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Internal modeMatchResult.PartialMatches.Add( ModeMatchAttributes.Create("mode0", new[] { "first-attr" }, new[] { "second-attr" })); modeMatchResult.PartiallyMatchedAttributes.Add("first-attr"); - var logger = MakeLogger(LogLevel.Verbose); + var logger = MakeLogger(LogLevel.Debug); var tagHelper = new Mock(); var uniqueId = "id"; var viewPath = "Views/Home/Index.cshtml"; @@ -90,7 +90,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Internal It.IsAny(), It.IsAny>()), Times.Once); Mock.Get(logger).Verify(l => l.Log( - LogLevel.Verbose, + LogLevel.Debug, It.IsAny(), It.IsAny(), It.IsAny(), @@ -121,7 +121,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Internal It.IsAny(), It.IsAny>()), Times.Never); Mock.Get(logger).Verify(l => l.Log( - LogLevel.Verbose, + LogLevel.Debug, It.IsAny(), It.IsAny(), It.IsAny(), diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs index 38739b4143..d96d5abb37 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs @@ -536,7 +536,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers var loggerData0 = (ILogValues)logger.Logged[0].State; - Assert.Equal(LogLevel.Verbose, logger.Logged[1].LogLevel); + Assert.Equal(LogLevel.Debug, logger.Logged[1].LogLevel); Assert.IsAssignableFrom(logger.Logged[1].State); Assert.StartsWith("Skipping processing for tag helper 'Microsoft.AspNet.Mvc.TagHelpers.ScriptTagHelper'" + " with id", @@ -602,7 +602,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers Assert.Single(logger.Logged); - Assert.Equal(LogLevel.Verbose, logger.Logged[0].LogLevel); + Assert.Equal(LogLevel.Debug, logger.Logged[0].LogLevel); Assert.IsAssignableFrom(logger.Logged[0].State); Assert.StartsWith("Skipping processing for tag helper 'Microsoft.AspNet.Mvc.TagHelpers.ScriptTagHelper'", ((ILogValues)logger.Logged[0].State).ToString());