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

React to Logging API changes

This commit is contained in:
Brennan 2016-01-21 09:52:39 -08:00
parent a2fe59fb2c
commit 15ed03eb26
19 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Server.Kestrel/Filter/FilteredStreamAdapter.cs
View File

@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Filter
{
if (copyAsyncTask.IsFaulted)
{
_log.LogError("FilteredStreamAdapter.CopyToAsync", copyAsyncTask.Exception);
_log.LogError(0, copyAsyncTask.Exception, "FilteredStreamAdapter.CopyToAsync");
}
else if (copyAsyncTask.IsCanceled)
{
@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Filter
}
catch (Exception ex)
{
_log.LogError("FilteredStreamAdapter.OnStreamClose", ex);
_log.LogError(0, ex, "FilteredStreamAdapter.OnStreamClose");
}
}
}

4
src/Microsoft.AspNetCore.Server.Kestrel/Http/Connection.cs
View File

@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
if (task.IsFaulted)
{
connection.Log.LogError("ConnectionFilter.OnConnection", task.Exception);
connection.Log.LogError(0, task.Exception, "ConnectionFilter.OnConnection");
connection.ConnectionControl.End(ProduceEndType.SocketDisconnect);
}
else if (task.IsCanceled)
@ -103,7 +103,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
}
catch (Exception ex)
{
Log.LogError("ConnectionFilter.OnConnection", ex);
Log.LogError(0, ex, "ConnectionFilter.OnConnection");
ConnectionControl.End(ProduceEndType.SocketDisconnect);
}
}

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

@ -302,7 +302,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
}
catch (Exception ex)
{
Log.LogError("Abort", ex);
Log.LogError(0, ex, "Abort");
}
try
@ -311,7 +311,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
}
catch (Exception ex)
{
Log.LogError("Abort", ex);
Log.LogError(0, ex, "Abort");
}
_abortedCts = null;
}

4
src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameOfT.cs
View File

@ -140,7 +140,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
}
catch (Exception ex)
{
Log.LogWarning("Connection processing ended abnormally", ex);
Log.LogWarning(0, ex, "Connection processing ended abnormally");
}
finally
{
@ -163,7 +163,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
}
catch (Exception ex)
{
Log.LogWarning("Connection shutdown abnormally", ex);
Log.LogWarning(0, ex, "Connection shutdown abnormally");
}
}
}

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

@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
var listener = (Listener) state;
if (error != null)
{
listener.Log.LogError("Listener.ConnectionCallback ", error);
listener.Log.LogError(0, error, "Listener.ConnectionCallback");
}
else
{

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

@ -69,7 +69,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
catch (UvException ex)
{
dispatchPipe.Dispose();
Log.LogError("ListenerPrimary.OnListenPipe", ex);
Log.LogError(0, ex, "ListenerPrimary.OnListenPipe");
return;
}

4
src/Microsoft.AspNetCore.Server.Kestrel/Http/ListenerSecondary.cs
View File

@ -112,7 +112,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
{
Exception ex;
Thread.Loop.Libuv.Check(status, out ex);
Log.LogError("DispatchPipe.ReadStart", ex);
Log.LogError(0, ex, "DispatchPipe.ReadStart");
}
DispatchPipe.Dispose();
@ -132,7 +132,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
}
catch (UvException ex)
{
Log.LogError("DispatchPipe.Accept", ex);
Log.LogError(0, ex, "DispatchPipe.Accept");
acceptSocket.Dispose();
return;
}

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

@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
}
catch (UvException ex)
{
Log.LogError("PipeListener.OnConnection", ex);
Log.LogError(0, ex, "PipeListener.OnConnection");
acceptSocket.Dispose();
return;
}

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

@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
}
catch (UvException ex)
{
Log.LogError("ListenerPrimary.OnConnection", ex);
Log.LogError(0, ex, "ListenerPrimary.OnConnection");
acceptSocket.Dispose();
return;
}

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

@ -653,7 +653,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
}
catch (Exception ex)
{
Self._log.LogError("SocketOutput.OnWriteCompleted", ex);
Self._log.LogError(0, ex, "SocketOutput.OnWriteCompleted");
}
}
}

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

@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
}
catch (UvException ex)
{
Log.LogError("TcpListener.OnConnection", ex);
Log.LogError(0, ex, "TcpListener.OnConnection");
acceptSocket.Dispose();
return;
}

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

@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
}
catch (UvException ex)
{
Log.LogError("TcpListenerPrimary.OnConnection", ex);
Log.LogError(0, ex, "TcpListenerPrimary.OnConnection");
acceptSocket.Dispose();
return;
}

4
src/Microsoft.AspNetCore.Server.Kestrel/Infrastructure/KestrelThread.cs
View File

@ -333,7 +333,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel
}
else
{
_log.LogError("KestrelThread.DoPostWork", ex);
_log.LogError(0, ex, "KestrelThread.DoPostWork");
throw;
}
}
@ -362,7 +362,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel
}
catch (Exception ex)
{
_log.LogError("KestrelThread.DoPostCloseHandle", ex);
_log.LogError(0, ex, "KestrelThread.DoPostCloseHandle");
throw;
}
}

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

@ -115,7 +115,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel
public virtual void ApplicationError(Exception ex)
{
_logger.LogError(13, "An unhandled exception was thrown by the application.", ex);
_logger.LogError(13, ex, "An unhandled exception was thrown by the application.");
}
public virtual void ConnectionError(long connectionId, Exception ex)
@ -128,7 +128,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel
_connectionDisconnectedWrite(_logger, connectionId, count, ex);
}
public virtual void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
public virtual void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
{
_logger.Log(logLevel, eventId, state, exception, formatter);
}

2
src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvConnectRequest.cs
View File

@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Networking
}
catch (Exception ex)
{
req._log.LogError("UvConnectRequest", ex);
req._log.LogError(0, ex, "UvConnectRequest");
throw;
}
}

6
src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvStreamHandle.cs
View File

@ -133,7 +133,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Networking
}
catch (Exception ex)
{
stream._log.LogError("UvConnectionCb", ex);
stream._log.LogError(0, ex, "UvConnectionCb");
throw;
}
}
@ -147,7 +147,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Networking
}
catch (Exception ex)
{
stream._log.LogError("UvAllocCb", ex);
stream._log.LogError(0, ex, "UvAllocCb");
buf = stream.Libuv.buf_init(IntPtr.Zero, 0);
throw;
}
@ -163,7 +163,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Networking
}
catch (Exception ex)
{
stream._log.LogError("UbReadCb", ex);
stream._log.LogError(0, ex, "UbReadCb");
throw;
}
}

2
src/Microsoft.AspNetCore.Server.Kestrel/Networking/UvWriteReq.cs
View File

@ -177,7 +177,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Networking
}
catch (Exception ex)
{
req._log.LogError("UvWriteCb", ex);
req._log.LogError(0, ex, "UvWriteCb");
throw;
}
}

4
test/Microsoft.AspNetCore.Server.KestrelTests/EngineTests.cs
View File

@ -1167,10 +1167,10 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
return true;
}
public void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
{
// Application errors are logged using 13 as the eventId.
if (eventId == 13)
if (eventId.Id == 13)
{
ApplicationErrorsLogged++;
}

2
test/Microsoft.AspNetCore.Server.KestrelTests/TestLogger.cs
View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
public class TestLogger : ILogger
{
public void Log(LogLevel logLevel, int eventId, object state, Exception exception, Func<object, Exception, string> formatter)
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
{
#if false
Console.WriteLine($"Log {logLevel}[{eventId}]: {formatter(state, exception)} {exception?.Message}");