tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-04-22 06:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed log message (#202)

Browse Source 
* Can't set StatusCode after Response has started

* fixed log message
This commit is contained in:
kinglionsoft 2018-01-19 03:28:53 +08:00 committed by Tom Pallister
parent 0784954971
commit 24870b1a83
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Ocelot/Logging/AspDotNetLogger.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Internal;
using Ocelot.Infrastructure.RequestData; using Ocelot.Infrastructure.RequestData;
namespace Ocelot.Logging namespace Ocelot.Logging
@ -22,21 +23,21 @@ namespace Ocelot.Logging
{ {
var requestId = GetOcelotRequestId(); var requestId = GetOcelotRequestId();
var previousRequestId = GetOcelotPreviousRequestId(); var previousRequestId = GetOcelotPreviousRequestId();
_logger.LogTrace("requestId: {requestId}, previousRequestId: {previousRequestId}, message: {message},", requestId, previousRequestId, message, args); _logger.LogTrace("requestId: {requestId}, previousRequestId: {previousRequestId}, message: {message},", requestId, previousRequestId, new FormattedLogValues(message, args).ToString());
} }
public void LogDebug(string message, params object[] args) public void LogDebug(string message, params object[] args)
{ {
var requestId = GetOcelotRequestId(); var requestId = GetOcelotRequestId();
var previousRequestId = GetOcelotPreviousRequestId(); var previousRequestId = GetOcelotPreviousRequestId();
_logger.LogDebug("requestId: {requestId}, previousRequestId: {previousRequestId}, message: {message},", requestId, previousRequestId, message, args); _logger.LogDebug("requestId: {requestId}, previousRequestId: {previousRequestId}, message: {message},", requestId, previousRequestId, new FormattedLogValues(message, args).ToString());
} }
public void LogInformation(string message, params object[] args) public void LogInformation(string message, params object[] args)
{ {
var requestId = GetOcelotRequestId(); var requestId = GetOcelotRequestId();
var previousRequestId = GetOcelotPreviousRequestId(); var previousRequestId = GetOcelotPreviousRequestId();
_logger.LogInformation("requestId: {requestId}, previousRequestId: {previousRequestId}, message: {message},", requestId, previousRequestId, message, args); _logger.LogInformation("requestId: {requestId}, previousRequestId: {previousRequestId}, message: {message},", requestId, previousRequestId, new FormattedLogValues(message, args).ToString());
} }
public void LogError(string message, Exception exception) public void LogError(string message, Exception exception)
@ -50,7 +51,7 @@ namespace Ocelot.Logging
{ {
var requestId = GetOcelotRequestId(); var requestId = GetOcelotRequestId();
var previousRequestId = GetOcelotPreviousRequestId(); var previousRequestId = GetOcelotPreviousRequestId();
_logger.LogError("requestId: {requestId}, previousRequestId: {previousRequestId}, message: {message}", requestId, previousRequestId, message, args); _logger.LogError("requestId: {requestId}, previousRequestId: {previousRequestId}, message: {message}", requestId, previousRequestId, new FormattedLogValues(message, args).ToString());
} }
public void LogCritical(string message, Exception exception) public void LogCritical(string message, Exception exception)
@ -66,7 +67,7 @@ namespace Ocelot.Logging
if (requestId == null || requestId.IsError) if (requestId == null || requestId.IsError)
{ {
return $"no request id"; return "no request id";
} }
return requestId.Data; return requestId.Data;
@ -78,7 +79,7 @@ namespace Ocelot.Logging
if (requestId == null || requestId.IsError) if (requestId == null || requestId.IsError)
{ {
return $"no previous request id"; return "no previous request id";
} }
return requestId.Data; return requestId.Data;