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

Additional fixes for #4604

This commit is contained in:
Ryan Nowak 2017-09-13 23:36:30 -07:00
parent 9db92dc6a7
commit db2d9ee56f
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
_objectResultExecuting = LoggerMessage.Define<string>( _objectResultExecuting = LoggerMessage.Define<string>(
LogLevel.Information, LogLevel.Information,
1, 1,
"Executing ObjectResult, writing value {Value}."); "Executing ObjectResult, writing value of type '{Type}'.");
_formatterSelected = LoggerMessage.Define<IOutputFormatter, string>( _formatterSelected = LoggerMessage.Define<IOutputFormatter, string>(
LogLevel.Debug, LogLevel.Debug,
@ -447,7 +447,8 @@ namespace Microsoft.AspNetCore.Mvc.Internal
{ {
if (logger.IsEnabled(LogLevel.Information)) if (logger.IsEnabled(LogLevel.Information))
{ {
_objectResultExecuting(logger, Convert.ToString(value), null); var type = value == null ? "null" : value.GetType().FullName;
_objectResultExecuting(logger, type, null);
} }
} }

6
src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/MvcJsonLoggerExtensions.cs
View File

@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
_jsonResultExecuting = LoggerMessage.Define<string>( _jsonResultExecuting = LoggerMessage.Define<string>(
LogLevel.Information, LogLevel.Information,
1, 1,
"Executing JsonResult, writing value type {Value}."); "Executing JsonResult, writing value of type '{Type}'.");
} }
public static void JsonInputException(this ILogger logger, Exception exception) public static void JsonInputException(this ILogger logger, Exception exception)
@ -32,8 +32,8 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
public static void JsonResultExecuting(this ILogger logger, object value) public static void JsonResultExecuting(this ILogger logger, object value)
{ {
var stringValue = value == null ? "null" : Convert.ToString(value.GetType()); var type = value == null ? "null" : value.GetType().FullName;
_jsonResultExecuting(logger, stringValue, null); _jsonResultExecuting(logger, type, null);
} }
} }
} }

4
test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Internal/JsonResultExecutorTest.cs
View File

@ -186,7 +186,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
public async Task ExecuteAsync_NonNullResult_LogsResultType() public async Task ExecuteAsync_NonNullResult_LogsResultType()
{ {
// Arrange // Arrange
var expected = "Executing JsonResult, writing value type System.String."; var expected = "Executing JsonResult, writing value of type 'System.String'.";
var context = GetActionContext(); var context = GetActionContext();
var logger = new StubLogger(); var logger = new StubLogger();
var executer = CreateExcutor(logger); var executer = CreateExcutor(logger);
@ -203,7 +203,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
public async Task ExecuteAsync_NullResult_LogsNull() public async Task ExecuteAsync_NullResult_LogsNull()
{ {
// Arrange // Arrange
var expected = "Executing JsonResult, writing value type null."; var expected = "Executing JsonResult, writing value of type 'null'.";
var context = GetActionContext(); var context = GetActionContext();
var logger = new StubLogger(); var logger = new StubLogger();
var executer = CreateExcutor(logger); var executer = CreateExcutor(logger);