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

Remove PreferHostingUrls from options

This commit is contained in:
John Luo 2017-04-25 10:54:44 -07:00
parent f63feeeac2
commit a64940a1f7
4 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
View File

@ -261,7 +261,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
var urls = _config[WebHostDefaults.ServerUrlsKey] ?? _config[DeprecatedServerUrlsKey]; var urls = _config[WebHostDefaults.ServerUrlsKey] ?? _config[DeprecatedServerUrlsKey];
if (!string.IsNullOrEmpty(urls)) if (!string.IsNullOrEmpty(urls))
{ {
serverAddressesFeature.PreferHostingUrls = _options.PreferHostingUrls; serverAddressesFeature.PreferHostingUrls = WebHostUtilities.ParseBool(_config, WebHostDefaults.PreferHostingUrlsKey);
foreach (var value in urls.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) foreach (var value in urls.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
{ {

14
src/Microsoft.AspNetCore.Hosting/Internal/WebHostOptions.cs
View File

@ -21,16 +21,15 @@ namespace Microsoft.AspNetCore.Hosting.Internal
ApplicationName = configuration[WebHostDefaults.ApplicationKey]; ApplicationName = configuration[WebHostDefaults.ApplicationKey];
StartupAssembly = configuration[WebHostDefaults.StartupAssemblyKey]; StartupAssembly = configuration[WebHostDefaults.StartupAssemblyKey];
DetailedErrors = ParseBool(configuration, WebHostDefaults.DetailedErrorsKey); DetailedErrors = WebHostUtilities.ParseBool(configuration, WebHostDefaults.DetailedErrorsKey);
CaptureStartupErrors = ParseBool(configuration, WebHostDefaults.CaptureStartupErrorsKey); CaptureStartupErrors = WebHostUtilities.ParseBool(configuration, WebHostDefaults.CaptureStartupErrorsKey);
Environment = configuration[WebHostDefaults.EnvironmentKey]; Environment = configuration[WebHostDefaults.EnvironmentKey];
WebRoot = configuration[WebHostDefaults.WebRootKey]; WebRoot = configuration[WebHostDefaults.WebRootKey];
ContentRootPath = configuration[WebHostDefaults.ContentRootKey]; ContentRootPath = configuration[WebHostDefaults.ContentRootKey];
PreventHostingStartup = ParseBool(configuration, WebHostDefaults.PreventHostingStartupKey); PreventHostingStartup = WebHostUtilities.ParseBool(configuration, WebHostDefaults.PreventHostingStartupKey);
// Search the primary assembly and configured assemblies. // Search the primary assembly and configured assemblies.
HostingStartupAssemblies = $"{ApplicationName};{configuration[WebHostDefaults.HostingStartupAssembliesKey]}" HostingStartupAssemblies = $"{ApplicationName};{configuration[WebHostDefaults.HostingStartupAssembliesKey]}"
.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries) ?? new string[0]; .Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries) ?? new string[0];
PreferHostingUrls = ParseBool(configuration, WebHostDefaults.PreferHostingUrlsKey);
var timeout = configuration[WebHostDefaults.ShutdownTimeoutKey]; var timeout = configuration[WebHostDefaults.ShutdownTimeoutKey];
if (!string.IsNullOrEmpty(timeout) if (!string.IsNullOrEmpty(timeout)
@ -58,14 +57,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
public string ContentRootPath { get; set; } public string ContentRootPath { get; set; }
public bool PreferHostingUrls { get; set; }
public TimeSpan ShutdownTimeout { get; set; } = TimeSpan.FromSeconds(5); public TimeSpan ShutdownTimeout { get; set; } = TimeSpan.FromSeconds(5);
private static bool ParseBool(IConfiguration configuration, string key)
{
return string.Equals("true", configuration[key], StringComparison.OrdinalIgnoreCase)
|| string.Equals("1", configuration[key], StringComparison.OrdinalIgnoreCase);
}
} }
} }

17
src/Microsoft.AspNetCore.Hosting/Internal/WebHostUtilities.cs Normal file
View File

@ -0,0 +1,17 @@
// 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.Extensions.Configuration;
namespace Microsoft.AspNetCore.Hosting.Internal
{
public class WebHostUtilities
{
public static bool ParseBool(IConfiguration configuration, string key)
{
return string.Equals("true", configuration[key], StringComparison.OrdinalIgnoreCase)
|| string.Equals("1", configuration[key], StringComparison.OrdinalIgnoreCase);
}
}
}

4
test/Microsoft.AspNetCore.Hosting.Tests/WebHostConfigurationsTests.cs
View File

@ -20,8 +20,7 @@ namespace Microsoft.AspNetCore.Hosting.Tests
{ "startupAssembly", "MyProjectReference" }, { "startupAssembly", "MyProjectReference" },
{ "environment", "Development"}, { "environment", "Development"},
{ "detailederrors", "true"}, { "detailederrors", "true"},
{ "captureStartupErrors", "true" }, { "captureStartupErrors", "true" }
{ "preferHostingUrls", "true" }
}; };
var config = new WebHostOptions(new ConfigurationBuilder().AddInMemoryCollection(parameters).Build()); var config = new WebHostOptions(new ConfigurationBuilder().AddInMemoryCollection(parameters).Build());
@ -32,7 +31,6 @@ namespace Microsoft.AspNetCore.Hosting.Tests
Assert.Equal("Development", config.Environment); Assert.Equal("Development", config.Environment);
Assert.True(config.CaptureStartupErrors); Assert.True(config.CaptureStartupErrors);
Assert.True(config.DetailedErrors); Assert.True(config.DetailedErrors);
Assert.True(config.PreferHostingUrls);
} }
[Fact] [Fact]