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

Merge branch 'release/2.2'

This commit is contained in:
Chris Ross (ASP.NET) 2018-08-09 14:02:35 -07:00
parent 10581d8953 b078521f17
commit 66e65635ad
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/NginxDeployer.cs
View File

@ -4,7 +4,9 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Net.Sockets;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Server.IntegrationTesting.Common; using Microsoft.AspNetCore.Server.IntegrationTesting.Common;
@ -19,6 +21,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
{ {
private string _configFile; private string _configFile;
private readonly int _waitTime = (int)TimeSpan.FromSeconds(30).TotalMilliseconds; private readonly int _waitTime = (int)TimeSpan.FromSeconds(30).TotalMilliseconds;
private Socket _portSelector;
public NginxDeployer(DeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) public NginxDeployer(DeploymentParameters deploymentParameters, ILoggerFactory loggerFactory)
: base(deploymentParameters, loggerFactory) : base(deploymentParameters, loggerFactory)
@ -30,10 +33,29 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
using (Logger.BeginScope("Deploy")) using (Logger.BeginScope("Deploy"))
{ {
_configFile = Path.GetTempFileName(); _configFile = Path.GetTempFileName();
var uri = string.IsNullOrEmpty(DeploymentParameters.ApplicationBaseUriHint) ? var uri = string.IsNullOrEmpty(DeploymentParameters.ApplicationBaseUriHint) ?
TestUriHelper.BuildTestUri(ServerType.Nginx) : new Uri("http://localhost:0") :
new Uri(DeploymentParameters.ApplicationBaseUriHint); new Uri(DeploymentParameters.ApplicationBaseUriHint);
if (uri.Port == 0)
{
var builder = new UriBuilder(uri);
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
// This works with nginx 1.9.1 and later using the reuseport flag, available on Ubuntu 16.04.
// Keep it open so nobody else claims the port
_portSelector = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
_portSelector.Bind(new IPEndPoint(IPAddress.Loopback, 0));
builder.Port = ((IPEndPoint)_portSelector.LocalEndPoint).Port;
}
else
{
builder.Port = TestPortHelper.GetNextPort();
}
uri = builder.Uri;
}
var redirectUri = TestUriHelper.BuildTestUri(ServerType.Nginx); var redirectUri = TestUriHelper.BuildTestUri(ServerType.Nginx);
if (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.CoreClr if (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.CoreClr
@ -122,7 +144,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
.Replace("[user]", userName) .Replace("[user]", userName)
.Replace("[errorlog]", errorLog) .Replace("[errorlog]", errorLog)
.Replace("[accesslog]", accessLog) .Replace("[accesslog]", accessLog)
.Replace("[listenPort]", originalUri.Port.ToString()) .Replace("[listenPort]", originalUri.Port.ToString() + (_portSelector != null ? " reuseport" : ""))
.Replace("[redirectUri]", redirectUri) .Replace("[redirectUri]", redirectUri)
.Replace("[pidFile]", pidFile); .Replace("[pidFile]", pidFile);
Logger.LogDebug("Using PID file: {pidFile}", pidFile); Logger.LogDebug("Using PID file: {pidFile}", pidFile);
@ -199,6 +221,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
File.Delete(_configFile); File.Delete(_configFile);
} }
_portSelector?.Dispose();
base.Dispose(); base.Dispose();
} }
} }