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

#276 #277 Fix ini loading, read location from command line.

This commit is contained in:
Chris R 2015-05-20 16:10:58 -07:00
parent b75a855b98
commit 2168176149
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,6 @@
// 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 System; using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNet.Hosting.Internal;
using Microsoft.Framework.Configuration; using Microsoft.Framework.Configuration;
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.Runtime; using Microsoft.Framework.Runtime;
@ -15,6 +11,7 @@ namespace Microsoft.AspNet.Hosting
public class Program public class Program
{ {
private const string HostingIniFile = "Microsoft.AspNet.Hosting.ini"; private const string HostingIniFile = "Microsoft.AspNet.Hosting.ini";
private const string ConfigFileKey = "config";
private readonly IServiceProvider _serviceProvider; private readonly IServiceProvider _serviceProvider;
@ -25,11 +22,13 @@ namespace Microsoft.AspNet.Hosting
public void Main(string[] args) public void Main(string[] args)
{ {
var config = new ConfigurationSection(); // Allow the location of the ini file to be specfied via a --config command line arg
if (File.Exists(HostingIniFile)) var tempConfig = new ConfigurationSection().AddCommandLine(args);
{ var configFilePath = tempConfig[ConfigFileKey] ?? HostingIniFile;
config.AddIniFile(HostingIniFile);
} var appBasePath = _serviceProvider.GetRequiredService<IApplicationEnvironment>().ApplicationBasePath;
var config = new ConfigurationSection(appBasePath);
config.AddIniFile(configFilePath, optional: true);
config.AddEnvironmentVariables(); config.AddEnvironmentVariables();
config.AddCommandLine(args); config.AddCommandLine(args);