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

Added logging to model binding requestpredicate shortcircuit

This commit is contained in:
Kiran Challa 2018-05-15 12:55:26 -07:00
parent b0796ce8a8
commit d80471ad15
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,8 @@ namespace Microsoft.AspNetCore.Mvc.Internal
private static readonly Action<ILogger, string, Type, string, Type, Exception> _foundNoValueForPropertyInRequest; private static readonly Action<ILogger, string, Type, string, Type, Exception> _foundNoValueForPropertyInRequest;
private static readonly Action<ILogger, string, string, Type, Exception> _foundNoValueForParameterInRequest; private static readonly Action<ILogger, string, string, Type, Exception> _foundNoValueForParameterInRequest;
private static readonly Action<ILogger, string, Type, Exception> _foundNoValueInRequest; private static readonly Action<ILogger, string, Type, Exception> _foundNoValueInRequest;
private static readonly Action<ILogger, Type, string, Exception> _parameterBinderRequestPredicateShortCircuitOfProperty;
private static readonly Action<ILogger, string, Exception> _parameterBinderRequestPredicateShortCircuitOfParameter;
private static readonly Action<ILogger, string, Type, Exception> _noPublicSettableProperties; private static readonly Action<ILogger, string, Type, Exception> _noPublicSettableProperties;
private static readonly Action<ILogger, Type, Exception> _cannotBindToComplexType; private static readonly Action<ILogger, Type, Exception> _cannotBindToComplexType;
private static readonly Action<ILogger, string, Type, Exception> _cannotBindToFilesCollectionDueToUnsupportedContentType; private static readonly Action<ILogger, string, Type, Exception> _cannotBindToFilesCollectionDueToUnsupportedContentType;
@ -636,6 +638,16 @@ namespace Microsoft.AspNetCore.Mvc.Internal
LogLevel.Debug, LogLevel.Debug,
46, 46,
"Could not find a value in the request with name '{ModelName}' of type '{ModelType}'."); "Could not find a value in the request with name '{ModelName}' of type '{ModelType}'.");
_parameterBinderRequestPredicateShortCircuitOfProperty = LoggerMessage.Define<Type, string>(
LogLevel.Debug,
47,
"Skipped binding property '{PropertyContainerType}.{PropertyName}' since it's binding information disallowed it for the current request.");
_parameterBinderRequestPredicateShortCircuitOfParameter = LoggerMessage.Define<string>(
LogLevel.Debug,
48,
"Skipped binding parameter '{ParameterName}' since it's binding information disallowed it for the current request.");
} }
public static void RegisteredOutputFormatters(this ILogger logger, IEnumerable<IOutputFormatter> outputFormatters) public static void RegisteredOutputFormatters(this ILogger logger, IEnumerable<IOutputFormatter> outputFormatters)
@ -1526,6 +1538,45 @@ namespace Microsoft.AspNetCore.Mvc.Internal
null); null);
} }
public static void ParameterBinderRequestPredicateShortCircuit(
this ILogger logger,
ModelMetadata modelMetadata,
ParameterDescriptor parameter)
{
switch (modelMetadata.MetadataKind)
{
case ModelMetadataKind.Parameter:
_parameterBinderRequestPredicateShortCircuitOfParameter(
logger,
modelMetadata.ParameterName,
null);
break;
case ModelMetadataKind.Property:
_parameterBinderRequestPredicateShortCircuitOfProperty(
logger,
modelMetadata.ContainerType,
modelMetadata.PropertyName,
null);
break;
case ModelMetadataKind.Type:
if (parameter is ControllerParameterDescriptor controllerParameterDescriptor)
{
_parameterBinderRequestPredicateShortCircuitOfParameter(
logger,
controllerParameterDescriptor.ParameterInfo.Name,
null);
}
else
{
// Likely binding a page handler parameter. Due to various special cases, parameter.Name may
// be empty. No way to determine actual name. This case is less likely than for binding logging
// (above). Should occur only with a legacy IModelMetadataProvider implementation.
_parameterBinderRequestPredicateShortCircuitOfParameter(logger, parameter.Name, null);
}
break;
}
}
private static void LogFilterExecutionPlan( private static void LogFilterExecutionPlan(
ILogger logger, ILogger logger,
string filterType, string filterType,

2
src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ParameterBinder.cs
View File

@ -205,6 +205,8 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
if (parameter.BindingInfo?.RequestPredicate?.Invoke(actionContext) == false) if (parameter.BindingInfo?.RequestPredicate?.Invoke(actionContext) == false)
{ {
Logger.ParameterBinderRequestPredicateShortCircuit(metadata, parameter);
return ModelBindingResult.Failed(); return ModelBindingResult.Failed();
} }