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

Merge remote-tracking branch 'origin/rel/2.0.0-preview2' into dev

This commit is contained in:
Pavel Krymets 2017-06-02 15:06:22 -07:00
parent 24c6b73faf 79036ea166
commit a8d40e22f7
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/AutobahnTestApp/Program.cs
View File

@ -15,12 +15,8 @@ namespace AutobahnTestApp
.AddCommandLine(args)
.Build();
var loggerFactory = new LoggerFactory()
.AddConsole();
var logger = loggerFactory.CreateLogger<Program>();
var builder = new WebHostBuilder()
.UseLoggerFactory(loggerFactory)
.ConfigureLogging(loggingBuilder => loggingBuilder.AddConsole())
.UseConfiguration(config)
.UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration()
@ -28,14 +24,14 @@ namespace AutobahnTestApp
if (string.Equals(builder.GetSetting("server"), "Microsoft.AspNetCore.Server.HttpSys", System.StringComparison.Ordinal))
{
logger.LogInformation("Using HttpSys server");
Console.WriteLine("Using HttpSys server");
builder.UseHttpSys();
}
else if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_PORT")))
{
// ANCM is hosting the process.
// The port will not yet be configured at this point, but will also not require HTTPS.
logger.LogInformation("Detected ANCM, using Kestrel");
Console.WriteLine("Detected ANCM, using Kestrel");
builder.UseKestrel();
}
else
@ -44,7 +40,7 @@ namespace AutobahnTestApp
var urls = builder.GetSetting(WebHostDefaults.ServerUrlsKey) ?? builder.GetSetting("server.urls");
builder.UseSetting(WebHostDefaults.ServerUrlsKey, string.Empty);
logger.LogInformation("Using Kestrel, URL: {url}", urls);
Console.WriteLine("Using Kestrel, URL: {url}", urls);
if (urls.Contains(";"))
{
@ -60,7 +56,7 @@ namespace AutobahnTestApp
if (uri.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase))
{
var certPath = Path.Combine(AppContext.BaseDirectory, "TestResources", "testCert.pfx");
logger.LogInformation("Using SSL with certificate: {certPath}", certPath);
Console.WriteLine("Using SSL with certificate: {certPath}", certPath);
listenOptions.UseHttps(certPath, "testPassword");
}
});