Skip to content

Commit 082d57b

Browse files
committed
Don't log action and page handler arguments
Fixes #9121
1 parent 5424045 commit 082d57b

File tree

2 files changed

+5
-41
lines changed

2 files changed

+5
-41
lines changed

src/Mvc/Mvc.Core/src/Internal/MvcCoreLoggerExtensions.cs

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ internal static class MvcCoreLoggerExtensions
3939
private static readonly Action<ILogger, string, Exception> _contentResultExecuting;
4040

4141
private static readonly Action<ILogger, string, ModelValidationState, Exception> _actionMethodExecuting;
42-
private static readonly Action<ILogger, string, string[], ModelValidationState, Exception> _actionMethodExecutingWithArguments;
4342
private static readonly Action<ILogger, string, string, double, Exception> _actionMethodExecuted;
4443

4544
private static readonly Action<ILogger, string, string[], Exception> _logFilterExecutionPlan;
@@ -173,11 +172,6 @@ static MvcCoreLoggerExtensions()
173172
1,
174173
"Executing action method {ActionName} - Validation state: {ValidationState}");
175174

176-
_actionMethodExecutingWithArguments = LoggerMessage.Define<string, string[], ModelValidationState>(
177-
LogLevel.Information,
178-
1,
179-
"Executing action method {ActionName} with arguments ({Arguments}) - Validation state: {ValidationState}");
180-
181175
_actionMethodExecuted = LoggerMessage.Define<string, string, double>(
182176
LogLevel.Information,
183177
2,
@@ -814,22 +808,7 @@ public static void ActionMethodExecuting(this ILogger logger, ControllerContext
814808
var actionName = context.ActionDescriptor.DisplayName;
815809

816810
var validationState = context.ModelState.ValidationState;
817-
818-
string[] convertedArguments;
819-
if (arguments == null)
820-
{
821-
_actionMethodExecuting(logger, actionName, validationState, null);
822-
}
823-
else
824-
{
825-
convertedArguments = new string[arguments.Length];
826-
for (var i = 0; i < arguments.Length; i++)
827-
{
828-
convertedArguments[i] = Convert.ToString(arguments[i]);
829-
}
830-
831-
_actionMethodExecutingWithArguments(logger, actionName, convertedArguments, validationState, null);
832-
}
811+
_actionMethodExecuting(logger, actionName, validationState, null);
833812
}
834813
}
835814

src/Mvc/Mvc.RazorPages/src/Internal/PageLoggerExtensions.cs

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal static class PageLoggerExtensions
1515
{
1616
public const string PageFilter = "Page Filter";
1717

18-
private static readonly Action<ILogger, string, string[], ModelValidationState, Exception> _handlerMethodExecuting;
18+
private static readonly Action<ILogger, string, ModelValidationState, Exception> _handlerMethodExecuting;
1919
private static readonly Action<ILogger, string, string, Exception> _handlerMethodExecuted;
2020
private static readonly Action<ILogger, object, Exception> _pageFilterShortCircuit;
2121
private static readonly Action<ILogger, string, string[], Exception> _malformedPageDirective;
@@ -28,10 +28,10 @@ static PageLoggerExtensions()
2828
{
2929
// These numbers start at 101 intentionally to avoid conflict with the IDs used by ResourceInvoker.
3030

31-
_handlerMethodExecuting = LoggerMessage.Define<string, string[], ModelValidationState>(
31+
_handlerMethodExecuting = LoggerMessage.Define<string, ModelValidationState>(
3232
LogLevel.Information,
3333
101,
34-
"Executing handler method {HandlerName} with arguments ({Arguments}) - ModelState is {ValidationState}");
34+
"Executing handler method {HandlerName} - ModelState is {ValidationState}");
3535

3636
_handlerMethodExecuted = LoggerMessage.Define<string, string>(
3737
LogLevel.Debug,
@@ -75,23 +75,8 @@ public static void ExecutingHandlerMethod(this ILogger logger, PageContext conte
7575
{
7676
var handlerName = handler.MethodInfo.Name;
7777

78-
string[] convertedArguments;
79-
if (arguments == null)
80-
{
81-
convertedArguments = null;
82-
}
83-
else
84-
{
85-
convertedArguments = new string[arguments.Length];
86-
for (var i = 0; i < arguments.Length; i++)
87-
{
88-
convertedArguments[i] = Convert.ToString(arguments[i]);
89-
}
90-
}
91-
9278
var validationState = context.ModelState.ValidationState;
93-
94-
_handlerMethodExecuting(logger, handlerName, convertedArguments, validationState, null);
79+
_handlerMethodExecuting(logger, handlerName, validationState, null);
9580
}
9681
}
9782

0 commit comments

Comments
 (0)