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

Log connection id in KestrelTrace.ApplicationError

This commit is contained in:
Stephen Halter 2016-03-03 15:21:04 -08:00
parent f1f185fd21
commit a8e5c0ce30
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.cs
View File

@ -1015,7 +1015,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
_applicationException = new AggregateException(_applicationException, ex); _applicationException = new AggregateException(_applicationException, ex);
} }
Log.ApplicationError(ex); Log.ApplicationError(ConnectionId, ex);
} }
private enum HttpVersionType private enum HttpVersionType

2
src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/IKestrelTrace.cs
View File

@ -39,5 +39,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Infrastructure
void NotAllConnectionsClosedGracefully(); void NotAllConnectionsClosedGracefully();
void ApplicationError(Exception ex); void ApplicationError(Exception ex);
void ApplicationError(string connectionId, Exception ex);
} }
} }

12
src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelTrace.cs
View File

@ -22,6 +22,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel
private static readonly Action<ILogger, string, int, Exception> _connectionWroteFin; private static readonly Action<ILogger, string, int, Exception> _connectionWroteFin;
private static readonly Action<ILogger, string, Exception> _connectionKeepAlive; private static readonly Action<ILogger, string, Exception> _connectionKeepAlive;
private static readonly Action<ILogger, string, Exception> _connectionDisconnect; private static readonly Action<ILogger, string, Exception> _connectionDisconnect;
private static readonly Action<ILogger, Exception> _applicationError;
private static readonly Action<ILogger, string, Exception> _applicationErrorWithId;
private static readonly Action<ILogger, string, Exception> _connectionError; private static readonly Action<ILogger, string, Exception> _connectionError;
private static readonly Action<ILogger, string, int, Exception> _connectionDisconnectedWrite; private static readonly Action<ILogger, string, int, Exception> _connectionDisconnectedWrite;
private static readonly Action<ILogger, Exception> _notAllConnectionsClosedGracefully; private static readonly Action<ILogger, Exception> _notAllConnectionsClosedGracefully;
@ -43,7 +45,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel
_connectionDisconnect = LoggerMessage.Define<string>(LogLevel.Debug, 10, @"Connection id ""{ConnectionId}"" disconnecting."); _connectionDisconnect = LoggerMessage.Define<string>(LogLevel.Debug, 10, @"Connection id ""{ConnectionId}"" disconnecting.");
// ConnectionWrite: Reserved: 11 // ConnectionWrite: Reserved: 11
// ConnectionWriteCallback: Reserved: 12 // ConnectionWriteCallback: Reserved: 12
// ApplicationError: Reserved: 13 - LoggerMessage.Define overload not present _applicationError = LoggerMessage.Define(LogLevel.Error, 13, "An unhandled exception thrown by the application.");
_applicationErrorWithId = LoggerMessage.Define<string>(LogLevel.Error, 13, @"Connection id ""{ConnectionId}"" unhandled exception thrown by the application.");
_connectionError = LoggerMessage.Define<string>(LogLevel.Information, 14, @"Connection id ""{ConnectionId}"" communication error"); _connectionError = LoggerMessage.Define<string>(LogLevel.Information, 14, @"Connection id ""{ConnectionId}"" communication error");
_connectionDisconnectedWrite = LoggerMessage.Define<string, int>(LogLevel.Debug, 15, @"Connection id ""{ConnectionId}"" write of ""{count}"" bytes to disconnected client."); _connectionDisconnectedWrite = LoggerMessage.Define<string, int>(LogLevel.Debug, 15, @"Connection id ""{ConnectionId}"" write of ""{count}"" bytes to disconnected client.");
_notAllConnectionsClosedGracefully = LoggerMessage.Define(LogLevel.Debug, 16, "Some connections failed to close gracefully during server shutdown."); _notAllConnectionsClosedGracefully = LoggerMessage.Define(LogLevel.Debug, 16, "Some connections failed to close gracefully during server shutdown.");
@ -120,7 +123,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel
public virtual void ApplicationError(Exception ex) public virtual void ApplicationError(Exception ex)
{ {
_logger.LogError(13, ex, "An unhandled exception was thrown by the application."); _applicationError(_logger, ex);
}
public virtual void ApplicationError(string connectionId, Exception ex)
{
_applicationErrorWithId(_logger, connectionId, ex);
} }
public virtual void ConnectionError(string connectionId, Exception ex) public virtual void ConnectionError(string connectionId, Exception ex)