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

Merge branch 'release' into dev

This commit is contained in:
Pranav K 2014-10-28 12:33:11 -07:00
parent 16725ac0d7 0350ca1dba
commit b95247d3c4
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Routing/Logging/LoggerExtensions.cs
View File

@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Routing.Logging.Internal
public static void WriteValues([NotNull] this ILogger logger, object values) public static void WriteValues([NotNull] this ILogger logger, object values)
{ {
logger.Write( logger.Write(
eventType: TraceType.Information, eventType: TraceType.Verbose,
eventId: 0, eventId: 0,
state: values, state: values,
exception: null, exception: null,

2
src/Microsoft.AspNet.Routing/RouteCollection.cs
View File

@ -64,7 +64,7 @@ namespace Microsoft.AspNet.Routing
} }
} }
if (_logger.IsEnabled(TraceType.Information)) if (_logger.IsEnabled(TraceType.Verbose))
{ {
_logger.WriteValues(new RouteCollectionRouteAsyncValues() _logger.WriteValues(new RouteCollectionRouteAsyncValues()
{ {

4
src/Microsoft.AspNet.Routing/RouteConstraintMatcher.cs
View File

@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Routing
if (!constraint.Match(httpContext, route, kvp.Key, routeValues, routeDirection)) if (!constraint.Match(httpContext, route, kvp.Key, routeValues, routeDirection))
{ {
if (routeDirection.Equals(RouteDirection.IncomingRequest) if (routeDirection.Equals(RouteDirection.IncomingRequest)
&& logger.IsEnabled(TraceType.Information)) && logger.IsEnabled(TraceType.Verbose))
{ {
logger.WriteValues(new RouteConstraintMatcherMatchValues() logger.WriteValues(new RouteConstraintMatcherMatchValues()
{ {
@ -43,7 +43,7 @@ namespace Microsoft.AspNet.Routing
} }
if (routeDirection.Equals(RouteDirection.IncomingRequest) if (routeDirection.Equals(RouteDirection.IncomingRequest)
&& logger.IsEnabled(TraceType.Information)) && logger.IsEnabled(TraceType.Verbose))
{ {
logger.WriteValues(new RouteConstraintMatcherMatchValues() logger.WriteValues(new RouteConstraintMatcherMatchValues()
{ {

2
src/Microsoft.AspNet.Routing/RouterMiddleware.cs
View File

@ -54,7 +54,7 @@ namespace Microsoft.AspNet.Builder
await Router.RouteAsync(context); await Router.RouteAsync(context);
if (_logger.IsEnabled(TraceType.Information)) if (_logger.IsEnabled(TraceType.Verbose))
{ {
_logger.WriteValues(new RouterMiddlewareInvokeValues() { Handled = context.IsHandled }); _logger.WriteValues(new RouterMiddlewareInvokeValues() { Handled = context.IsHandled });
} }

6
src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs
View File

@ -107,7 +107,7 @@ namespace Microsoft.AspNet.Routing.Template
if (values == null) if (values == null)
{ {
if (_logger.IsEnabled(TraceType.Information)) if (_logger.IsEnabled(TraceType.Verbose))
{ {
_logger.WriteValues(CreateRouteAsyncValues( _logger.WriteValues(CreateRouteAsyncValues(
requestPath, requestPath,
@ -137,7 +137,7 @@ namespace Microsoft.AspNet.Routing.Template
context.RouteData.DataTokens = _dataTokens; context.RouteData.DataTokens = _dataTokens;
await _target.RouteAsync(context); await _target.RouteAsync(context);
if (_logger.IsEnabled(TraceType.Information)) if (_logger.IsEnabled(TraceType.Verbose))
{ {
_logger.WriteValues(CreateRouteAsyncValues( _logger.WriteValues(CreateRouteAsyncValues(
requestPath, requestPath,
@ -149,7 +149,7 @@ namespace Microsoft.AspNet.Routing.Template
} }
else else
{ {
if (_logger.IsEnabled(TraceType.Information)) if (_logger.IsEnabled(TraceType.Verbose))
{ {
_logger.WriteValues(CreateRouteAsyncValues( _logger.WriteValues(CreateRouteAsyncValues(
requestPath, requestPath,