From 4e91e4e36fbc28c27400c8d804f2406ab0dc076d Mon Sep 17 00:00:00 2001
From: Jass Bagga <jabagga@microsoft.com>
Date: Thu, 1 Jun 2017 14:01:08 -0700
Subject: [PATCH] Correct short-circuit log message for result filters (#6350)

Addresses #6318
---
 .../Internal/MvcCoreLoggerExtensions.cs             | 13 +++++++++++++
 .../Internal/ResourceInvoker.cs                     |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreLoggerExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreLoggerExtensions.cs
index 5652c19022..66a3685520 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreLoggerExtensions.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreLoggerExtensions.cs
@@ -38,6 +38,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
 
         private static readonly Action<ILogger, object, Exception> _authorizationFailure;
         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> _exceptionFilterShortCircuit;
 
@@ -128,6 +129,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
                 4,
                 "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>(
                 LogLevel.Debug,
                 3,
@@ -360,6 +366,13 @@ namespace Microsoft.AspNetCore.Mvc.Internal
             _resourceFilterShortCircuit(logger, filter, null);
         }
 
+        public static void ResultFilterShortCircuited(
+            this ILogger logger,
+            IFilterMetadata filter)
+        {
+            _resultFilterShortCircuit(logger, filter, null);
+        }
+
         public static void ExceptionFilterShortCircuited(
             this ILogger logger,
             IFilterMetadata filter)
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResourceInvoker.cs b/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResourceInvoker.cs
index f58e76ef6b..2fe722031d 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResourceInvoker.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Core/Internal/ResourceInvoker.cs
@@ -736,7 +736,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
                         if (resultExecutedContext == null || resultExecutingContext.Cancel == true)
                         {
                             // Short-circuited by not calling next || Short-circuited by setting Cancel == true
-                            _logger.ResourceFilterShortCircuited(filter);
+                            _logger.ResultFilterShortCircuited(filter);
 
                             _resultExecutedContext = new ResultExecutedContext(
                                 _actionContext,
@@ -769,7 +769,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
                         if (_resultExecutingContext.Cancel == true)
                         {
                             // Short-circuited by setting Cancel == true
-                            _logger.ResourceFilterShortCircuited(filter);
+                            _logger.ResultFilterShortCircuited(filter);
 
                             _resultExecutedContext = new ResultExecutedContext(
                                 resultExecutingContext,