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-27 10:25:47 -07:00
parent 979107493e
commit 04dbf42264
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
samples/MiddlewareAnalysisSample/Startup.cs
View File

@ -18,9 +18,6 @@ namespace MiddlewareAnaysisSample
public void Configure(IApplicationBuilder app, ILoggerFactory factory, DiagnosticListener diagnosticListener) public void Configure(IApplicationBuilder app, ILoggerFactory factory, DiagnosticListener diagnosticListener)
{ {
// Displays all log levels
factory.AddConsole(LogLevel.Debug);
// Listen for middleware events and log them to the console. // Listen for middleware events and log them to the console.
var listener = new TestDiagnosticListener(); var listener = new TestDiagnosticListener();
diagnosticListener.SubscribeWithAdapter(listener); diagnosticListener.SubscribeWithAdapter(listener);
@ -53,7 +50,7 @@ namespace MiddlewareAnaysisSample
return next(context); return next(context);
}; };
}); });
app.Map("/throw", throwApp => app.Map("/throw", throwApp =>
{ {
throwApp.Run(context => { throw new Exception("Application Exception"); }); throwApp.Run(context => { throw new Exception("Application Exception"); });
@ -85,6 +82,11 @@ namespace MiddlewareAnaysisSample
public static void Main(string[] args) public static void Main(string[] args)
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.ConfigureLogging((_, factory) =>
{
factory.AddConsole();
factory.AddFilter("Console", level => level >= LogLevel.Debug);
})
.UseKestrel() .UseKestrel()
.UseIISIntegration() .UseIISIntegration()
.UseStartup<Startup>() .UseStartup<Startup>()

10
src/Microsoft.AspNetCore.Diagnostics.Elm/ElmExtensions.cs
View File

@ -5,7 +5,6 @@ using System;
using Microsoft.AspNetCore.Diagnostics.Elm; using Microsoft.AspNetCore.Diagnostics.Elm;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
namespace Microsoft.AspNetCore.Builder namespace Microsoft.AspNetCore.Builder
{ {
@ -22,9 +21,12 @@ namespace Microsoft.AspNetCore.Builder
} }
// add the elm provider to the factory here so the logger can start capturing logs immediately // add the elm provider to the factory here so the logger can start capturing logs immediately
var factory = app.ApplicationServices.GetRequiredService<ILoggerFactory>(); var factory = app.ApplicationServices.GetRequiredService<ILoggerFactory>() as LoggerFactory;
var provider = app.ApplicationServices.GetRequiredService<ElmLoggerProvider>(); if (factory != null)
factory.AddProvider(provider); {
var provider = app.ApplicationServices.GetRequiredService<ElmLoggerProvider>();
factory.AddProvider(provider);
}
return app.UseMiddleware<ElmCaptureMiddleware>(); return app.UseMiddleware<ElmCaptureMiddleware>();
} }

4
src/Microsoft.AspNetCore.Diagnostics.Elm/Microsoft.AspNetCore.Diagnostics.Elm.csproj
View File

@ -17,9 +17,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" /> <PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.RazorViews.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All"/> <PackageReference Include="Microsoft.Extensions.RazorViews.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
<DotNetCliToolReference Include="RazorPageGenerator" Version="$(AspNetCoreVersion)" /> <DotNetCliToolReference Include="RazorPageGenerator" Version="$(AspNetCoreVersion)" />
</ItemGroup> </ItemGroup>