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

Correct short-circuit log message for result filters (#6350) 

Addresses #6318
This commit is contained in:
Jass Bagga 2017-06-01 14:01:08 -07:00 committed by GitHub
parent a0d9b08f58
commit 4e91e4e36f
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreLoggerExtensions.cs
View File

@ -38,6 +38,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
private static readonly Action<ILogger, object, Exception> _authorizationFailure; private static readonly Action<ILogger, object, Exception> _authorizationFailure;
private static readonly Action<ILogger, object, Exception> _resourceFilterShortCircuit; private static readonly Action<ILogger, object, Exception> _resourceFilterShortCircuit;
private static readonly Action<ILogger, object, Exception> _resultFilterShortCircuit;
private static readonly Action<ILogger, object, Exception> _actionFilterShortCircuit; private static readonly Action<ILogger, object, Exception> _actionFilterShortCircuit;
private static readonly Action<ILogger, object, Exception> _exceptionFilterShortCircuit; private static readonly Action<ILogger, object, Exception> _exceptionFilterShortCircuit;
@ -128,6 +129,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
4, 4,
"Request was short circuited at resource filter '{ResourceFilter}'."); "Request was short circuited at resource filter '{ResourceFilter}'.");
_resultFilterShortCircuit = LoggerMessage.Define<object>(
LogLevel.Debug,
5,
"Request was short circuited at result filter '{ResultFilter}'.");
_actionFilterShortCircuit = LoggerMessage.Define<object>( _actionFilterShortCircuit = LoggerMessage.Define<object>(
LogLevel.Debug, LogLevel.Debug,
3, 3,
@ -360,6 +366,13 @@ namespace Microsoft.AspNetCore.Mvc.Internal
_resourceFilterShortCircuit(logger, filter, null); _resourceFilterShortCircuit(logger, filter, null);
} }
public static void ResultFilterShortCircuited(
this ILogger logger,
IFilterMetadata filter)
{
_resultFilterShortCircuit(logger, filter, null);
}
public static void ExceptionFilterShortCircuited( public static void ExceptionFilterShortCircuited(
this ILogger logger, this ILogger logger,
IFilterMetadata filter) IFilterMetadata filter)

4
src/Microsoft.AspNetCore.Mvc.Core/Internal/ResourceInvoker.cs
View File

@ -736,7 +736,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
if (resultExecutedContext == null || resultExecutingContext.Cancel == true) if (resultExecutedContext == null || resultExecutingContext.Cancel == true)
{ {
// Short-circuited by not calling next || Short-circuited by setting Cancel == true // Short-circuited by not calling next || Short-circuited by setting Cancel == true
_logger.ResourceFilterShortCircuited(filter); _logger.ResultFilterShortCircuited(filter);
_resultExecutedContext = new ResultExecutedContext( _resultExecutedContext = new ResultExecutedContext(
_actionContext, _actionContext,
@ -769,7 +769,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
if (_resultExecutingContext.Cancel == true) if (_resultExecutingContext.Cancel == true)
{ {
// Short-circuited by setting Cancel == true // Short-circuited by setting Cancel == true
_logger.ResourceFilterShortCircuited(filter); _logger.ResultFilterShortCircuited(filter);
_resultExecutedContext = new ResultExecutedContext( _resultExecutedContext = new ResultExecutedContext(
resultExecutingContext, resultExecutingContext,