From aadbed62de6f7e8af081107a289572234ac8ccca Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Wed, 9 Jan 2019 12:01:14 +1300 Subject: [PATCH] Add event name in routing (#6455) --- .../src/Logging/RouteConstraintMatcherExtensions.cs | 10 +++++----- .../src/Logging/RouterMiddlewareLoggerExtensions.cs | 10 +++++----- .../Routing/src/Logging/TreeRouterLoggerExtensions.cs | 10 +++++----- src/Http/Routing/src/RouteBase.cs | 2 +- src/Http/Routing/src/RouteConstraintMatcher.cs | 2 +- src/Http/Routing/src/RouterMiddleware.cs | 2 +- src/Http/Routing/src/Tree/TreeRouter.cs | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Http/Routing/src/Logging/RouteConstraintMatcherExtensions.cs b/src/Http/Routing/src/Logging/RouteConstraintMatcherExtensions.cs index 3036d2b9b9..afa7337e75 100644 --- a/src/Http/Routing/src/Logging/RouteConstraintMatcherExtensions.cs +++ b/src/Http/Routing/src/Logging/RouteConstraintMatcherExtensions.cs @@ -8,24 +8,24 @@ namespace Microsoft.AspNetCore.Routing.Logging { internal static class RouteConstraintMatcherExtensions { - private static readonly Action _routeValueDoesNotMatchConstraint; + private static readonly Action _constraintNotMatched; static RouteConstraintMatcherExtensions() { - _routeValueDoesNotMatchConstraint = LoggerMessage.Define( + _constraintNotMatched = LoggerMessage.Define( LogLevel.Debug, - 1, + new EventId(1, "ConstraintNotMatched"), "Route value '{RouteValue}' with key '{RouteKey}' did not match " + "the constraint '{RouteConstraint}'"); } - public static void RouteValueDoesNotMatchConstraint( + public static void ConstraintNotMatched( this ILogger logger, object routeValue, string routeKey, IRouteConstraint routeConstraint) { - _routeValueDoesNotMatchConstraint(logger, routeValue, routeKey, routeConstraint, null); + _constraintNotMatched(logger, routeValue, routeKey, routeConstraint, null); } } } diff --git a/src/Http/Routing/src/Logging/RouterMiddlewareLoggerExtensions.cs b/src/Http/Routing/src/Logging/RouterMiddlewareLoggerExtensions.cs index 77fba27317..cdbd644775 100644 --- a/src/Http/Routing/src/Logging/RouterMiddlewareLoggerExtensions.cs +++ b/src/Http/Routing/src/Logging/RouterMiddlewareLoggerExtensions.cs @@ -8,19 +8,19 @@ namespace Microsoft.AspNetCore.Routing.Logging { internal static class RouterMiddlewareLoggerExtensions { - private static readonly Action _requestDidNotMatchRoutes; + private static readonly Action _requestNotMatched; static RouterMiddlewareLoggerExtensions() { - _requestDidNotMatchRoutes = LoggerMessage.Define( + _requestNotMatched = LoggerMessage.Define( LogLevel.Debug, - 1, + new EventId(1, "RequestNotMatched"), "Request did not match any routes"); } - public static void RequestDidNotMatchRoutes(this ILogger logger) + public static void RequestNotMatched(this ILogger logger) { - _requestDidNotMatchRoutes(logger, null); + _requestNotMatched(logger, null); } } } diff --git a/src/Http/Routing/src/Logging/TreeRouterLoggerExtensions.cs b/src/Http/Routing/src/Logging/TreeRouterLoggerExtensions.cs index 825e9ef888..e6733263f9 100644 --- a/src/Http/Routing/src/Logging/TreeRouterLoggerExtensions.cs +++ b/src/Http/Routing/src/Logging/TreeRouterLoggerExtensions.cs @@ -8,22 +8,22 @@ namespace Microsoft.AspNetCore.Routing.Logging { internal static class TreeRouterLoggerExtensions { - private static readonly Action _matchedRoute; + private static readonly Action _requestMatchedRoute; static TreeRouterLoggerExtensions() { - _matchedRoute = LoggerMessage.Define( + _requestMatchedRoute = LoggerMessage.Define( LogLevel.Debug, - 1, + new EventId(1, "RequestMatchedRoute"), "Request successfully matched the route with name '{RouteName}' and template '{RouteTemplate}'"); } - public static void MatchedRoute( + public static void RequestMatchedRoute( this ILogger logger, string routeName, string routeTemplate) { - _matchedRoute(logger, routeName, routeTemplate, null); + _requestMatchedRoute(logger, routeName, routeTemplate, null); } } } diff --git a/src/Http/Routing/src/RouteBase.cs b/src/Http/Routing/src/RouteBase.cs index 984862e1df..2659e7fac4 100644 --- a/src/Http/Routing/src/RouteBase.cs +++ b/src/Http/Routing/src/RouteBase.cs @@ -107,7 +107,7 @@ namespace Microsoft.AspNetCore.Routing { return Task.CompletedTask; } - _logger.MatchedRoute(Name, ParsedTemplate.TemplateText); + _logger.RequestMatchedRoute(Name, ParsedTemplate.TemplateText); return OnRouteMatched(context); } diff --git a/src/Http/Routing/src/RouteConstraintMatcher.cs b/src/Http/Routing/src/RouteConstraintMatcher.cs index d19a743fad..26728e817a 100644 --- a/src/Http/Routing/src/RouteConstraintMatcher.cs +++ b/src/Http/Routing/src/RouteConstraintMatcher.cs @@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Routing { routeValues.TryGetValue(kvp.Key, out var routeValue); - logger.RouteValueDoesNotMatchConstraint(routeValue, kvp.Key, kvp.Value); + logger.ConstraintNotMatched(routeValue, kvp.Key, kvp.Value); } return false; diff --git a/src/Http/Routing/src/RouterMiddleware.cs b/src/Http/Routing/src/RouterMiddleware.cs index a8256dc5fa..aa46d4f570 100644 --- a/src/Http/Routing/src/RouterMiddleware.cs +++ b/src/Http/Routing/src/RouterMiddleware.cs @@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Builder if (context.Handler == null) { - _logger.RequestDidNotMatchRoutes(); + _logger.RequestNotMatched(); await _next.Invoke(httpContext); } else diff --git a/src/Http/Routing/src/Tree/TreeRouter.cs b/src/Http/Routing/src/Tree/TreeRouter.cs index 3f98325641..47fbf3802e 100644 --- a/src/Http/Routing/src/Tree/TreeRouter.cs +++ b/src/Http/Routing/src/Tree/TreeRouter.cs @@ -208,7 +208,7 @@ namespace Microsoft.AspNetCore.Routing.Tree continue; } - _logger.MatchedRoute(entry.RouteName, entry.RouteTemplate.TemplateText); + _logger.RequestMatchedRoute(entry.RouteName, entry.RouteTemplate.TemplateText); context.RouteData.Routers.Add(entry.Handler); await entry.Handler.RouteAsync(context);