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

Log message style changes 

- Disabled some log messages for possibly being too verbose.
- Don't log ConnectionReadFin when there is an error.
This commit is contained in:
Stephen Halter 2015-09-09 13:06:47 -07:00
parent 0ef096b41c
commit 1ebf98d40d
3 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Microsoft.AspNet.Server.Kestrel/Http/Connection.cs
View File

@ -72,7 +72,6 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
}
else if (normalDone || errorDone)
{
Log.ConnectionReadFin(_connectionId);
SocketInput.RemoteIntakeFin = true;
_socket.ReadStop();
@ -80,6 +79,10 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
{
Log.LogError("Connection.OnRead", error);
}
else
{
Log.ConnectionReadFin(_connectionId);
}
}
@ -118,19 +121,19 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
}
_connectionState = ConnectionState.Shutdown;
Log.ConnectionWriteFin(_connectionId, 0);
Log.ConnectionWriteFin(_connectionId);
Thread.Post(
state =>
{
Log.ConnectionWriteFin(_connectionId, 1);
var self = (Connection)state;
var shutdown = new UvShutdownReq(Log);
var shutdown = new UvShutdownReq(self.Log);
shutdown.Init(self.Thread.Loop);
shutdown.Shutdown(self._socket, (req, status, _) =>
shutdown.Shutdown(self._socket, (req, status, state2) =>
{
Log.ConnectionWriteFin(_connectionId, 1);
var self2 = (Connection)state2;
self2.Log.ConnectionWroteFin(_connectionId, status);
req.Dispose();
}, null);
}, this);
},
this);
break;

4
src/Microsoft.AspNet.Server.Kestrel/Infrastructure/IKestrelTrace.cs
View File

@ -16,7 +16,9 @@ namespace Microsoft.AspNet.Server.Kestrel.Infrastructure
void ConnectionReadFin(long connectionId);
void ConnectionWriteFin(long connectionId, int step);
void ConnectionWriteFin(long connectionId);
void ConnectionWroteFin(long connectionId, int status);
void ConnectionKeepAlive(long connectionId);

34
src/Microsoft.AspNet.Server.Kestrel/Infrastructure/KestrelTrace.cs
View File

@ -21,57 +21,65 @@ namespace Microsoft.AspNet.Server.Kestrel
public void ConnectionStart(long connectionId)
{
_logger.LogDebug(13, $"{nameof(ConnectionStart)} -> Id: {connectionId}");
_logger.LogDebug(1, @"Connection id ""{ConnectionId}"" started.", connectionId);
}
public void ConnectionStop(long connectionId)
{
_logger.LogDebug(14, $"{nameof(ConnectionStop)} -> Id: {connectionId}");
_logger.LogDebug(2, @"Connection id ""{ConnectionId}"" stopped.", connectionId);
}
public void ConnectionRead(long connectionId, int status)
public void ConnectionRead(long connectionId, int count)
{
_logger.LogDebug(4, $"{nameof(ConnectionRead)} -> Id: {connectionId}, Status: {status}");
// Don't log for now since this could be *too* verbose.
//_logger.LogVerbose(3, @"Connection id ""{ConnectionId}"" received ""{Count}"" bytes.", connectionId, count);
}
public void ConnectionPause(long connectionId)
{
_logger.LogDebug(5, $"{nameof(ConnectionPause)} -> Id: {connectionId}");
_logger.LogDebug(4, @"Connection id ""{ConnectionId}"" paused.", connectionId);
}
public void ConnectionResume(long connectionId)
{
_logger.LogDebug(6, $"{nameof(ConnectionResume)} -> Id: {connectionId}");
_logger.LogDebug(5, @"Connection id ""{ConnectionId}"" resumed.", connectionId);
}
public void ConnectionReadFin(long connectionId)
{
_logger.LogDebug(7, $"{nameof(ConnectionReadFin)} -> Id: {connectionId}");
_logger.LogDebug(6, @"Connection id ""{ConnectionId}"" received FIN.", connectionId);
}
public void ConnectionWriteFin(long connectionId, int step)
public void ConnectionWriteFin(long connectionId)
{
_logger.LogDebug(8, $"{nameof(ConnectionWriteFin)} -> Id: {connectionId}, Step: {step}");
_logger.LogDebug(7, @"Connection id ""{ConnectionId}"" sending FIN.");
}
public void ConnectionWroteFin(long connectionId, int status)
{
_logger.LogDebug(8, @"Connection id ""{ConnectionId}"" sent FIN with status ""{Status}"".", status);
}
public void ConnectionKeepAlive(long connectionId)
{
_logger.LogDebug(9, $"{nameof(ConnectionKeepAlive)} -> Id: {connectionId}");
_logger.LogDebug(9, @"Connection id ""{ConnectionId}"" completed keep alive response.", connectionId);
}
public void ConnectionDisconnect(long connectionId)
{
_logger.LogDebug(10, $"{nameof(ConnectionDisconnect)} -> Id: {connectionId}");
_logger.LogDebug(10, @"Connection id ""{ConnectionId}"" disconnected.", connectionId);
}
public void ConnectionWrite(long connectionId, int count)
{
_logger.LogDebug(11, $"{nameof(ConnectionWrite)} -> Id: {connectionId}, Count: {count}");
// Don't log for now since this could be *too* verbose.
//_logger.LogVerbose(11, @"Connection id ""{ConnectionId}"" sent ""{Count}"" bytes.", connectionId, count);
}
public void ConnectionWriteCallback(long connectionId, int status)
{
_logger.LogDebug(12, $"{nameof(ConnectionWriteCallback)} -> Id: {connectionId}, Status: {status}");
// Don't log for now since this could be *too* verbose.
//_logger.LogVerbose(12, @"Connection id ""{ConnectionId}"" finished write with status ""{Status}"".", connectionId, status);
}
public void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)