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

React to Logging API changes

This commit is contained in:
BrennanConroy 2017-04-26 14:16:39 -07:00
parent 3936bf64f6
commit a1579f190f
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/Microsoft.AspNetCore.Hosting.TestSites/Program.cs
View File

@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Http.Features;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
namespace ServerComparison.TestSites namespace ServerComparison.TestSites
{ {
@ -21,6 +22,11 @@ namespace ServerComparison.TestSites
var builder = new WebHostBuilder() var builder = new WebHostBuilder()
.UseServer(new NoopServer()) .UseServer(new NoopServer())
.UseConfiguration(config) .UseConfiguration(config)
.ConfigureLogging((_, factory) =>
{
factory.AddConsole();
factory.AddFilter("Console", level => level >= LogLevel.Warning);
})
.UseStartup("Microsoft.AspNetCore.Hosting.TestSites"); .UseStartup("Microsoft.AspNetCore.Hosting.TestSites");
var host = builder.Build(); var host = builder.Build();

3
test/Microsoft.AspNetCore.Hosting.TestSites/StartupShutdown.cs
View File

@ -25,9 +25,6 @@ namespace Microsoft.AspNetCore.Hosting.TestSites
Console.WriteLine("Stopped end"); Console.WriteLine("Stopped end");
}); });
loggerFactory.AddConsole(minLevel: LogLevel.Warning);
app.Run(context => app.Run(context =>
{ {
return context.Response.WriteAsync("Hello World"); return context.Response.WriteAsync("Hello World");

4
test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
View File

@ -992,7 +992,7 @@ namespace Microsoft.AspNetCore.Hosting
{ {
var provider = new TestLoggerProvider(); var provider = new TestLoggerProvider();
var builder = CreateWebHostBuilder() var builder = CreateWebHostBuilder()
.ConfigureLogging(factory => .ConfigureLogging((_, factory) =>
{ {
factory.AddProvider(provider); factory.AddProvider(provider);
}) })
@ -1104,7 +1104,7 @@ namespace Microsoft.AspNetCore.Hosting
.UseSetting("testhostingstartup_chain", builder.GetSetting("testhostingstartup_chain") + "0") .UseSetting("testhostingstartup_chain", builder.GetSetting("testhostingstartup_chain") + "0")
.ConfigureServices(services => services.AddSingleton<ServiceA>()) .ConfigureServices(services => services.AddSingleton<ServiceA>())
.ConfigureServices(services => services.AddSingleton<ITestSink>(loggerProvider.Sink)) .ConfigureServices(services => services.AddSingleton<ITestSink>(loggerProvider.Sink))
.ConfigureLogging(lf => lf.AddProvider(loggerProvider)) .ConfigureLogging((_, lf) => lf.AddProvider(loggerProvider))
.ConfigureAppConfiguration((context, configurationBuilder) => configurationBuilder.AddInMemoryCollection( .ConfigureAppConfiguration((context, configurationBuilder) => configurationBuilder.AddInMemoryCollection(
new [] new []
{ {

5
test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs
View File

@ -815,10 +815,13 @@ namespace Microsoft.AspNetCore.Hosting
{ {
var builder = CreateBuilder() var builder = CreateBuilder()
.UseFakeServer() .UseFakeServer()
.ConfigureLogging((_, factory) =>
{
factory.AddProvider(new AllMessagesAreNeeded());
})
.Configure( .Configure(
appBuilder => appBuilder =>
{ {
appBuilder.ApplicationServices.GetRequiredService<ILoggerFactory>().AddProvider(new AllMessagesAreNeeded());
appBuilder.Run(requestDelegate); appBuilder.Run(requestDelegate);
}); });
return builder.Build(); return builder.Build();