huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reacting to verbose rename

This commit is contained in:
John Luo 2015-12-03 17:18:38 -08:00
parent 09a293afe9
commit f9f59fe58b
13 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Mvc.Core/Logging/ControllerActionInvokerLoggerExtensions.cs
View File

@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.Logging
"Executing action method {ActionName} with arguments ({Arguments}) - ModelState is {ValidationState}'");
_actionMethodExecuted = LoggerMessage.Define<string, string>(
LogLevel.Verbose,
LogLevel.Debug,
2,
"Executed action method {ActionName}, returned result {ActionResult}.'");
}

2
src/Microsoft.AspNet.Mvc.Core/Logging/DefaultActionSelectorLoggerExtensions.cs
View File

@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Mvc.Logging
1,
"Request matched multiple actions resulting in ambiguity. Matching actions: {AmbiguousActions}");
_constraintMismatch = LoggerMessage.Define<string, string, IActionConstraint>(
LogLevel.Verbose,
LogLevel.Debug,
2,
"Action '{ActionName}' with id '{ActionId}' did not match the constraint '{ActionConstraint}'");
}

6
src/Microsoft.AspNet.Mvc.Core/Logging/FilterActionInvokerLoggerExtensions.cs
View File

@ -21,15 +21,15 @@ namespace Microsoft.AspNet.Mvc.Logging
1,
"Authorization failed for the request at filter '{AuthorizationFilter}'.");
_resourceFilterShortCircuit = LoggerMessage.Define<object>(
LogLevel.Verbose,
LogLevel.Debug,
2,
"Request was short circuited at resource filter '{ResourceFilter}'.");
_actionFilterShortCircuit = LoggerMessage.Define<object>(
LogLevel.Verbose,
LogLevel.Debug,
3,
"Request was short circuited at action filter '{ActionFilter}'.");
_exceptionFilterShortCircuit = LoggerMessage.Define<object>(
LogLevel.Verbose,
LogLevel.Debug,
4,
"Request was short circuited at exception filter '{ExceptionFilter}'.");
}

4
src/Microsoft.AspNet.Mvc.Core/Logging/MvcRouteHandlerLoggerExtensions.cs
View File

@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.Logging
static MvcRouteHandlerLoggerExtensions()
{
_actionExecuting = LoggerMessage.Define<string>(
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

8
src/Microsoft.AspNet.Mvc.Core/Logging/ObjectResultExecutorLoggerExtensions.cs
View File

@ -29,19 +29,19 @@ namespace Microsoft.AspNet.Mvc.Logging
1,
"Executing ObjectResult, writing value {Value}.");
_formatterSelected = LoggerMessage.Define<IOutputFormatter, string>(
LogLevel.Verbose,
LogLevel.Debug,
2,
"Selected output formatter '{OutputFormatter}' and content type '{ContentType}' to write the response.");
_skippedContentNegotiation = LoggerMessage.Define<string>(
LogLevel.Verbose,
LogLevel.Debug,
3,
"Skipped content negotiation as content type '{ContentType}' is explicitly set for the response.");
_noAcceptForNegotiation = LoggerMessage.Define<string>(
LogLevel.Verbose,
LogLevel.Debug,
4,
"No information found on request to perform content negotiation.");
_noFormatterFromNegotiation = LoggerMessage.Define<IEnumerable<MediaTypeHeaderValue>>(
LogLevel.Verbose,
LogLevel.Debug,
5,
"Could not find an output formatter based on content negotiation. Accepted types were ({AcceptTypes})");
}

2
src/Microsoft.AspNet.Mvc.Core/Logging/ViewResultExecutorLoggerExtensions.cs
View File

@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Mvc.Logging
static ViewResultExecutorLoggerExtensions()
{
_viewFound = LoggerMessage.Define<string>(
LogLevel.Verbose,
LogLevel.Debug,
1,
"The view '{ViewName}' was found.");
_viewNotFound = LoggerMessage.Define<string, IEnumerable<string>>(

2
src/Microsoft.AspNet.Mvc.Formatters.Json/Logging/JsonInputFormatterLoggerExtensions.cs
View File

@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Mvc.Formatters.Json.Logging
static JsonInputFormatterLoggerExtensions()
{
_jsonInputFormatterCrashed = LoggerMessage.Define<string>(
LogLevel.Verbose,
LogLevel.Debug,
1,
"JSON input formatter threw an exception.");
}

4
src/Microsoft.AspNet.Mvc.TagHelpers/Logging/ModeMatchResultLoggerExtensions.cs
View File

@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Logging
static ModeMatchResultLoggerExtensions()
{
_skippingProcessing = LoggerMessage.Define<ITagHelper, string>(
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);
}

4
src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/DefaultViewComponentInvokerLoggerExtensions.cs
View File

@ -16,12 +16,12 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures.Logging
static DefaultViewComponentInvokerLoggerExtensions()
{
_viewComponentExecuting = LoggerMessage.Define<string>(
LogLevel.Verbose,
LogLevel.Debug,
1,
"Executing view component {ViewComponentName}");
_viewComponentExecuted = LoggerMessage.Define<string, double, string>(
LogLevel.Verbose,
LogLevel.Debug,
2,
"Executed view component {ViewComponentName} in {ElapsedMilliseconds}ms and returned " +
"{ViewComponentResult}");

2
src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/PartialViewResultExecutorLoggerExtensions.cs
View File

@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures.Logging
1,
"Executing PartialViewResult, running view at path {Path}.");
_partialViewFound = LoggerMessage.Define<string>(
LogLevel.Verbose,
LogLevel.Debug,
2,
"The partial view '{PartialViewName}' was found.");
_partialViewNotFound = LoggerMessage.Define<string, IEnumerable<string>>(

2
src/Microsoft.AspNet.Mvc.ViewFeatures/Logging/ViewResultExecutorLoggerExtensions.cs
View File

@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.Logging
1,
"Executing ViewResult, running view at path {Path}.");
_viewFound = LoggerMessage.Define<string>(
LogLevel.Verbose,
LogLevel.Debug,
2,
"The view '{ViewName}' was found.");
_viewNotFound = LoggerMessage.Define<string, IEnumerable<string>>(

16
test/Microsoft.AspNet.Mvc.TagHelpers.Test/Internal/ModeMatchResultTest.cs
View File

@ -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<string>();
var logger = MakeLogger(LogLevel.Verbose);
var logger = MakeLogger(LogLevel.Debug);
var tagHelper = new Mock<ITagHelper>();
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<int>(),
It.IsAny<object>(),
It.IsAny<Exception>(),
@ -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<ITagHelper>();
var uniqueId = "id";
var viewPath = "Views/Home/Index.cshtml";
@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Internal
It.IsAny<Exception>(),
It.IsAny<Func<object, Exception, string>>()), Times.Never);
Mock.Get(logger).Verify(l => l.Log(
LogLevel.Verbose,
LogLevel.Debug,
It.IsAny<int>(),
It.IsAny<object>(),
It.IsAny<Exception>(),
@ -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<ITagHelper>();
var uniqueId = "id";
var viewPath = "Views/Home/Index.cshtml";
@ -90,7 +90,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Internal
It.IsAny<Exception>(),
It.IsAny<Func<object, Exception, string>>()), Times.Once);
Mock.Get(logger).Verify(l => l.Log(
LogLevel.Verbose,
LogLevel.Debug,
It.IsAny<int>(),
It.IsAny<object>(),
It.IsAny<Exception>(),
@ -121,7 +121,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Internal
It.IsAny<Exception>(),
It.IsAny<Func<object, Exception, string>>()), Times.Never);
Mock.Get(logger).Verify(l => l.Log(
LogLevel.Verbose,
LogLevel.Debug,
It.IsAny<int>(),
It.IsAny<object>(),
It.IsAny<Exception>(),

4
test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs
View File

@ -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<ILogValues>(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<ILogValues>(logger.Logged[0].State);
Assert.StartsWith("Skipping processing for tag helper 'Microsoft.AspNet.Mvc.TagHelpers.ScriptTagHelper'",
((ILogValues)logger.Logged[0].State).ToString());