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

Don't blast null values into UseStartup/Server

This commit is contained in:
Hao Kung 2015-03-30 20:46:23 -07:00
parent 77e2dc263f
commit fd9f845dc9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Microsoft.AspNet.Hosting/Program.cs
View File

@ -33,10 +33,18 @@ namespace Microsoft.AspNet.Hosting
config.AddEnvironmentVariables(); config.AddEnvironmentVariables();
config.AddCommandLine(args); config.AddCommandLine(args);
var engine = WebHost.CreateEngine(_serviceProvider, config) var engine = WebHost.CreateEngine(_serviceProvider, config);
.UseServer(config.Get("server")) var server = config.Get("server");
.UseStartup(config.Get("app")); if (server != null)
{
engine.UseServer(server);
}
var startup = config.Get("app");
if (startup != null)
{
engine.UseStartup(startup);
}
var serverShutdown = engine.Start(); var serverShutdown = engine.Start();
var loggerFactory = engine.ApplicationServices.GetRequiredService<ILoggerFactory>(); var loggerFactory = engine.ApplicationServices.GetRequiredService<ILoggerFactory>();
var appShutdownService = engine.ApplicationServices.GetRequiredService<IApplicationShutdown>(); var appShutdownService = engine.ApplicationServices.GetRequiredService<IApplicationShutdown>();