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

Merge branch 'release' into dev

This commit is contained in:
Chris Ross 2014-10-24 12:25:49 -07:00
parent 733eb85b54 6e2b94dde3
commit 75caf72cb3
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Microsoft.AspNet.Server.WebListener/LogHelper.cs
View File

@ -64,6 +64,11 @@ namespace Microsoft.AspNet.Server.WebListener
} }
} }
internal static void LogVerbose(ILogger logger, string location, Exception exception)
{
LogVerbose(logger, location + "; " + exception.ToString());
}
internal static void LogException(ILogger logger, string location, Exception exception) internal static void LogException(ILogger logger, string location, Exception exception)
{ {
if (logger == null) if (logger == null)

12
src/Microsoft.AspNet.Server.WebListener/MessagePump.cs
View File

@ -123,8 +123,15 @@ namespace Microsoft.AspNet.Server.WebListener
} }
catch (Exception exception) catch (Exception exception)
{ {
LogHelper.LogException(_logger, "ListenForNextRequestAsync", exception); Contract.Assert(_stopping);
Contract.Assert(!_listener.IsListening); if (_stopping)
{
LogHelper.LogVerbose(_logger, "ListenForNextRequestAsync-Stopping", exception);
}
else
{
LogHelper.LogException(_logger, "ListenForNextRequestAsync", exception);
}
return; return;
} }
try try
@ -197,6 +204,7 @@ namespace Microsoft.AspNet.Server.WebListener
public void Dispose() public void Dispose()
{ {
LogHelper.LogInfo(_logger, "Stop");
_stopping = true; _stopping = true;
// Wait for active requests to drain // Wait for active requests to drain
if (_outstandingRequests > 0) if (_outstandingRequests > 0)