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

Changing argument type of serverFeatures to IFeatureCollection

This commit is contained in:
John Luo 2015-10-20 10:05:22 -07:00
parent 3774b6055f
commit 99f5febc3b
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Microsoft.AspNet.Hosting/Builder/ApplicationBuilderFactory.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using Microsoft.AspNet.Builder; using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Builder.Internal; using Microsoft.AspNet.Builder.Internal;
using Microsoft.AspNet.Http.Features;
namespace Microsoft.AspNet.Hosting.Builder namespace Microsoft.AspNet.Hosting.Builder
{ {
@ -16,9 +17,9 @@ namespace Microsoft.AspNet.Hosting.Builder
_serviceProvider = serviceProvider; _serviceProvider = serviceProvider;
} }
public IApplicationBuilder CreateBuilder(object server) public IApplicationBuilder CreateBuilder(IFeatureCollection serverFeatures)
{ {
return new ApplicationBuilder(_serviceProvider, server); return new ApplicationBuilder(_serviceProvider, serverFeatures);
} }
} }
} }

3
src/Microsoft.AspNet.Hosting/Builder/IApplicationBuilderFactory.cs
View File

@ -2,11 +2,12 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNet.Builder; using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Http.Features;
namespace Microsoft.AspNet.Hosting.Builder namespace Microsoft.AspNet.Hosting.Builder
{ {
public interface IApplicationBuilderFactory public interface IApplicationBuilderFactory
{ {
IApplicationBuilder CreateBuilder(object server); IApplicationBuilder CreateBuilder(IFeatureCollection serverFeatures);
} }
} }

14
src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs
View File

@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Hosting.Internal
// Only one of these should be set // Only one of these should be set
internal IServerFactory ServerFactory { get; set; } internal IServerFactory ServerFactory { get; set; }
internal string ServerFactoryLocation { get; set; } internal string ServerFactoryLocation { get; set; }
private IFeatureCollection _serverInstance; private IFeatureCollection _serverFeatures;
public HostingEngine( public HostingEngine(
IServiceCollection appServices, IServiceCollection appServices,
@ -89,7 +89,7 @@ namespace Microsoft.AspNet.Hosting.Internal
var contextFactory = _applicationServices.GetRequiredService<IHttpContextFactory>(); var contextFactory = _applicationServices.GetRequiredService<IHttpContextFactory>();
var contextAccessor = _applicationServices.GetRequiredService<IHttpContextAccessor>(); var contextAccessor = _applicationServices.GetRequiredService<IHttpContextAccessor>();
var diagnosticSource = _applicationServices.GetRequiredService<DiagnosticSource>(); var diagnosticSource = _applicationServices.GetRequiredService<DiagnosticSource>();
var server = ServerFactory.Start(_serverInstance, var server = ServerFactory.Start(_serverFeatures,
async features => async features =>
{ {
var httpContext = contextFactory.CreateHttpContext(features); var httpContext = contextFactory.CreateHttpContext(features);
@ -125,7 +125,7 @@ namespace Microsoft.AspNet.Hosting.Internal
_applicationLifetime.NotifyStarted(); _applicationLifetime.NotifyStarted();
return new Application(ApplicationServices, _serverInstance, new Disposable(() => return new Application(ApplicationServices, _serverFeatures, new Disposable(() =>
{ {
_applicationLifetime.StopApplication(); _applicationLifetime.StopApplication();
server.Dispose(); server.Dispose();
@ -181,7 +181,7 @@ namespace Microsoft.AspNet.Hosting.Internal
EnsureServer(); EnsureServer();
var builderFactory = _applicationServices.GetRequiredService<IApplicationBuilderFactory>(); var builderFactory = _applicationServices.GetRequiredService<IApplicationBuilderFactory>();
var builder = builderFactory.CreateBuilder(_serverInstance); var builder = builderFactory.CreateBuilder(_serverFeatures);
builder.ApplicationServices = _applicationServices; builder.ApplicationServices = _applicationServices;
var startupFilters = _applicationServices.GetService<IEnumerable<IStartupFilter>>(); var startupFilters = _applicationServices.GetService<IEnumerable<IStartupFilter>>();
@ -247,10 +247,10 @@ namespace Microsoft.AspNet.Hosting.Internal
ServerFactory = _applicationServices.GetRequiredService<IServerLoader>().LoadServerFactory(ServerFactoryLocation); ServerFactory = _applicationServices.GetRequiredService<IServerLoader>().LoadServerFactory(ServerFactoryLocation);
} }
if (_serverInstance == null) if (_serverFeatures == null)
{ {
_serverInstance = ServerFactory.Initialize(_config); _serverFeatures = ServerFactory.Initialize(_config);
var addresses = _serverInstance?.Get<IServerAddressesFeature>()?.Addresses; var addresses = _serverFeatures?.Get<IServerAddressesFeature>()?.Addresses;
if (addresses != null && !addresses.IsReadOnly) if (addresses != null && !addresses.IsReadOnly)
{ {
var port = _config[ServerPort]; var port = _config[ServerPort];