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

Catch and log uv_accept errors 

- This is also what is done by node.js
- "tcp, pipe: don't assert on uv_accept() errors (Ben Noordhuis)"

0685707bc6
This commit is contained in:
Stephen Halter 2015-09-10 14:45:26 -07:00
parent f14af1f409
commit 2d01f2752b
8 changed files with 69 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Microsoft.AspNet.Server.Kestrel/Http/ListenerPrimary.cs
View File

@ -1,11 +1,12 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNet.Server.Kestrel.Infrastructure;
using Microsoft.AspNet.Server.Kestrel.Networking;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNet.Server.Kestrel.Infrastructure;
using Microsoft.AspNet.Server.Kestrel.Networking;
using Microsoft.Framework.Logging;
namespace Microsoft.AspNet.Server.Kestrel.Http
{
@ -56,15 +57,18 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
var dispatchPipe = new UvPipeHandle(Log);
dispatchPipe.Init(Thread.Loop, true);
try
{
pipe.Accept(dispatchPipe);
}
catch (Exception)
catch (UvException ex)
{
dispatchPipe.Dispose();
Log.LogError("ListenerPrimary.OnListenPipe", ex);
return;
}
_dispatchPipes.Add(dispatchPipe);
}

2
src/Microsoft.AspNet.Server.Kestrel/Http/ListenerSecondary.cs
View File

@ -86,7 +86,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
{
DispatchPipe.Accept(acceptSocket);
}
catch (Exception ex)
catch (UvException ex)
{
Log.LogError("DispatchPipe.Accept", ex);
acceptSocket.Dispose();

13
src/Microsoft.AspNet.Server.Kestrel/Http/PipeListener.cs
View File

@ -1,8 +1,10 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNet.Server.Kestrel.Infrastructure;
using Microsoft.AspNet.Server.Kestrel.Networking;
using Microsoft.Framework.Logging;
namespace Microsoft.AspNet.Server.Kestrel.Http
{
@ -36,7 +38,16 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
{
var acceptSocket = new UvPipeHandle(Log);
acceptSocket.Init(Thread.Loop, false);
listenSocket.Accept(acceptSocket);
try
{
listenSocket.Accept(acceptSocket);
}
catch (UvException ex)
{
Log.LogError("PipeListener.OnConnection", ex);
return;
}
DispatchConnection(acceptSocket);
}

13
src/Microsoft.AspNet.Server.Kestrel/Http/PipeListenerPrimary.cs
View File

@ -1,8 +1,10 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNet.Server.Kestrel.Infrastructure;
using Microsoft.AspNet.Server.Kestrel.Networking;
using Microsoft.Framework.Logging;
namespace Microsoft.AspNet.Server.Kestrel.Http
{
@ -36,7 +38,16 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
{
var acceptSocket = new UvPipeHandle(Log);
acceptSocket.Init(Thread.Loop, false);
listenSocket.Accept(acceptSocket);
try
{
listenSocket.Accept(acceptSocket);
}
catch (UvException ex)
{
Log.LogError("ListenerPrimary.OnConnection", ex);
return;
}
DispatchConnection(acceptSocket);
}

13
src/Microsoft.AspNet.Server.Kestrel/Http/TcpListener.cs
View File

@ -1,9 +1,11 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Net;
using Microsoft.AspNet.Server.Kestrel.Infrastructure;
using Microsoft.AspNet.Server.Kestrel.Networking;
using Microsoft.Framework.Logging;
namespace Microsoft.AspNet.Server.Kestrel.Http
{
@ -37,7 +39,16 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
{
var acceptSocket = new UvTcpHandle(Log);
acceptSocket.Init(Thread.Loop, Thread.QueueCloseHandle);
listenSocket.Accept(acceptSocket);
try
{
listenSocket.Accept(acceptSocket);
}
catch (UvException ex)
{
Log.LogError("TcpListener.OnConnection", ex);
return;
}
DispatchConnection(acceptSocket);
}

13
src/Microsoft.AspNet.Server.Kestrel/Http/TcpListenerPrimary.cs
View File

@ -1,9 +1,11 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Net;
using Microsoft.AspNet.Server.Kestrel.Infrastructure;
using Microsoft.AspNet.Server.Kestrel.Networking;
using Microsoft.Framework.Logging;
namespace Microsoft.AspNet.Server.Kestrel.Http
{
@ -37,7 +39,16 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
{
var acceptSocket = new UvTcpHandle(Log);
acceptSocket.Init(Thread.Loop, Thread.QueueCloseHandle);
listenSocket.Accept(acceptSocket);
try
{
listenSocket.Accept(acceptSocket);
}
catch (UvException ex)
{
Log.LogError("TcpListenerPrimary.OnConnection", ex);
return;
}
DispatchConnection(acceptSocket);
}

2
src/Microsoft.AspNet.Server.Kestrel/Networking/Libuv.cs
View File

@ -73,7 +73,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
{
var errorName = err_name(statusCode);
var errorDescription = strerror(statusCode);
error = new Exception("Error " + statusCode + " " + errorName + " " + errorDescription);
error = new UvException("Error " + statusCode + " " + errorName + " " + errorDescription);
}
else
{

12
src/Microsoft.AspNet.Server.Kestrel/Networking/UvException.cs Normal file
View File

@ -0,0 +1,12 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
namespace Microsoft.AspNet.Server.Kestrel.Networking
{
public class UvException : Exception
{
public UvException(string message) : base(message) { }
}
}