From 85e0fc52fbbc28459548bd2e808db0f807559dc7 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Wed, 26 Apr 2017 15:38:16 -0700 Subject: [PATCH] React to Logging API changes (#77) --- test/ServerComparison.TestSites/Program.cs | 6 ++++++ test/ServerComparison.TestSites/StartupHelloWorld.cs | 2 -- .../ServerComparison.TestSites/StartupNtlmAuthentication.cs | 2 -- .../StartupResponseCompression.cs | 2 -- test/ServerComparison.TestSites/StartupResponses.cs | 2 -- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/test/ServerComparison.TestSites/Program.cs b/test/ServerComparison.TestSites/Program.cs index 150eaa872a..25a79e0c3b 100644 --- a/test/ServerComparison.TestSites/Program.cs +++ b/test/ServerComparison.TestSites/Program.cs @@ -5,6 +5,7 @@ using System; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Server.HttpSys; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; namespace ServerComparison.TestSites { @@ -18,6 +19,11 @@ namespace ServerComparison.TestSites var builder = new WebHostBuilder() .UseConfiguration(config) + .ConfigureLogging((_, factory) => + { + factory.AddConsole(); + factory.AddFilter("Console", level => level >= LogLevel.Warning); + }) .UseIISIntegration() .UseStartup("ServerComparison.TestSites"); diff --git a/test/ServerComparison.TestSites/StartupHelloWorld.cs b/test/ServerComparison.TestSites/StartupHelloWorld.cs index 0c387f1b59..f92b8d45c7 100644 --- a/test/ServerComparison.TestSites/StartupHelloWorld.cs +++ b/test/ServerComparison.TestSites/StartupHelloWorld.cs @@ -11,8 +11,6 @@ namespace ServerComparison.TestSites { public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(minLevel: LogLevel.Warning); - app.Run(ctx => { return ctx.Response.WriteAsync("Hello World"); diff --git a/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs b/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs index 639c747e35..d35a434c50 100644 --- a/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs +++ b/test/ServerComparison.TestSites/StartupNtlmAuthentication.cs @@ -12,8 +12,6 @@ namespace ServerComparison.TestSites { public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(minLevel: LogLevel.Warning); - app.Use(async (context, next) => { try diff --git a/test/ServerComparison.TestSites/StartupResponseCompression.cs b/test/ServerComparison.TestSites/StartupResponseCompression.cs index 54d0810a5d..4f5398fe4c 100644 --- a/test/ServerComparison.TestSites/StartupResponseCompression.cs +++ b/test/ServerComparison.TestSites/StartupResponseCompression.cs @@ -18,8 +18,6 @@ namespace ServerComparison.TestSites public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(minLevel: LogLevel.Warning); - // NGinx's default min size is 20 bytes var helloWorldBody = "Hello World;" + new string('a', 20); diff --git a/test/ServerComparison.TestSites/StartupResponses.cs b/test/ServerComparison.TestSites/StartupResponses.cs index ebce640b37..3fc22ee091 100644 --- a/test/ServerComparison.TestSites/StartupResponses.cs +++ b/test/ServerComparison.TestSites/StartupResponses.cs @@ -12,8 +12,6 @@ namespace ServerComparison.TestSites { public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(minLevel: LogLevel.Warning); - app.Map("/contentlength", subApp => { subApp.Run(context =>