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

React to logging in DI (#180)

This commit is contained in:
Pavel Krymets 2017-06-02 08:34:43 -07:00 committed by GitHub
parent 5f23a96443
commit 79036ea166
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) .AddCommandLine(args)
.Build(); .Build();
var loggerFactory = new LoggerFactory()
.AddConsole();
var logger = loggerFactory.CreateLogger<Program>();
var builder = new WebHostBuilder() var builder = new WebHostBuilder()
.UseLoggerFactory(loggerFactory) .ConfigureLogging(loggingBuilder => loggingBuilder.AddConsole())
.UseConfiguration(config) .UseConfiguration(config)
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration() .UseIISIntegration()
@ -28,14 +24,14 @@ namespace AutobahnTestApp
if (string.Equals(builder.GetSetting("server"), "Microsoft.AspNetCore.Server.HttpSys", System.StringComparison.Ordinal)) 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(); builder.UseHttpSys();
} }
else if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_PORT"))) else if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_PORT")))
{ {
// ANCM is hosting the process. // ANCM is hosting the process.
// The port will not yet be configured at this point, but will also not require HTTPS. // 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(); builder.UseKestrel();
} }
else else
@ -44,7 +40,7 @@ namespace AutobahnTestApp
var urls = builder.GetSetting(WebHostDefaults.ServerUrlsKey) ?? builder.GetSetting("server.urls"); var urls = builder.GetSetting(WebHostDefaults.ServerUrlsKey) ?? builder.GetSetting("server.urls");
builder.UseSetting(WebHostDefaults.ServerUrlsKey, string.Empty); builder.UseSetting(WebHostDefaults.ServerUrlsKey, string.Empty);
logger.LogInformation("Using Kestrel, URL: {url}", urls); Console.WriteLine("Using Kestrel, URL: {url}", urls);
if (urls.Contains(";")) if (urls.Contains(";"))
{ {
@ -60,7 +56,7 @@ namespace AutobahnTestApp
if (uri.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase)) if (uri.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase))
{ {
var certPath = Path.Combine(AppContext.BaseDirectory, "TestResources", "testCert.pfx"); 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"); listenOptions.UseHttps(certPath, "testPassword");
} }
}); });