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

Revert "Enable trace for test app (#178)" (#180) 

This reverts commit f7d5f3e64e.
This commit is contained in:
Pavel Krymets 2018-04-13 09:43:03 -07:00 committed by GitHub
parent f7d5f3e64e
commit d245232ddb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sample/ApplicationInsightsHostingStartupSample/Startup.cs
View File

@ -24,9 +24,7 @@ namespace IISSample
public void ConfigureJavaScript(IApplicationBuilder app) public void ConfigureJavaScript(IApplicationBuilder app)
{ {
Console.WriteLine("ConfigureJavaScript 1");
app.UseMvcWithDefaultRoute(); app.UseMvcWithDefaultRoute();
Console.WriteLine("ConfigureJavaScript 2");
} }
public void ConfigureDefaultLogging(IApplicationBuilder app, ILoggerFactory loggerFactory) public void ConfigureDefaultLogging(IApplicationBuilder app, ILoggerFactory loggerFactory)
@ -75,12 +73,11 @@ namespace IISSample
public static void Main(string[] args) public static void Main(string[] args)
{ {
Console.WriteLine("Main 1");
var config = new ConfigurationBuilder() var config = new ConfigurationBuilder()
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
.AddCommandLine(args) .AddCommandLine(args)
.Build(); .Build();
Console.WriteLine("Main 2");
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseConfiguration(config) .UseConfiguration(config)
.ConfigureLogging((hostingContext, builder) => .ConfigureLogging((hostingContext, builder) =>
@ -92,7 +89,7 @@ namespace IISSample
.UseStartup<Startup>() .UseStartup<Startup>()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.Build(); .Build();
Console.WriteLine("Main 3");
host.Run(); host.Run();
} }
} }

8
src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsLoggerStartupFilter.cs
View File

@ -13,27 +13,19 @@ namespace Microsoft.AspNetCore.ApplicationInsights.HostingStartup
{ {
public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next) public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
{ {
Console.WriteLine("ApplicationInsightsLoggerStartupFilter 1");
return builder => return builder =>
{ {
Console.WriteLine("ApplicationInsightsLoggerStartupFilter 2");
var loggerFactory = builder.ApplicationServices.GetService<ILoggerFactory>(); var loggerFactory = builder.ApplicationServices.GetService<ILoggerFactory>();
// We need to disable filtering on logger, filtering would be done by LoggerFactory // We need to disable filtering on logger, filtering would be done by LoggerFactory
var loggerEnabled = true; var loggerEnabled = true;
Console.WriteLine("ApplicationInsightsLoggerStartupFilter 3");
loggerFactory.AddApplicationInsights( loggerFactory.AddApplicationInsights(
builder.ApplicationServices, builder.ApplicationServices,
(s, level) => loggerEnabled, (s, level) => loggerEnabled,
() => loggerEnabled = false); () => loggerEnabled = false);
Console.WriteLine("ApplicationInsightsLoggerStartupFilter 4");
next(builder); next(builder);
Console.WriteLine("ApplicationInsightsLoggerStartupFilter 5");
}; };
} }
} }

14
src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsStartupLoader.cs
View File

@ -29,13 +29,9 @@ namespace Microsoft.AspNetCore.ApplicationInsights.HostingStartup
/// <param name="builder"></param> /// <param name="builder"></param>
public void Configure(IWebHostBuilder builder) public void Configure(IWebHostBuilder builder)
{ {
Console.WriteLine("ApplicationInsightsHostingStartup 1");
builder.UseApplicationInsights(); builder.UseApplicationInsights();
Console.WriteLine("ApplicationInsightsHostingStartup 2");
builder.ConfigureServices(InitializeServices); builder.ConfigureServices(InitializeServices);
Console.WriteLine("ApplicationInsightsHostingStartup 3");
} }
@ -45,26 +41,18 @@ namespace Microsoft.AspNetCore.ApplicationInsights.HostingStartup
/// <param name="services">The <see cref="IServiceCollection"/> associated with the application.</param> /// <param name="services">The <see cref="IServiceCollection"/> associated with the application.</param>
private void InitializeServices(IServiceCollection services) private void InitializeServices(IServiceCollection services)
{ {
Console.WriteLine("ApplicationInsightsHostingStartup 4");
services.AddSingleton<IStartupFilter, ApplicationInsightsLoggerStartupFilter>(); services.AddSingleton<IStartupFilter, ApplicationInsightsLoggerStartupFilter>();
services.AddSingleton<ITagHelperComponent, JavaScriptSnippetTagHelperComponent>(); services.AddSingleton<ITagHelperComponent, JavaScriptSnippetTagHelperComponent>();
Console.WriteLine("ApplicationInsightsHostingStartup 5");
var home = Environment.GetEnvironmentVariable("HOME"); var home = Environment.GetEnvironmentVariable("HOME");
if (!string.IsNullOrEmpty(home)) if (!string.IsNullOrEmpty(home))
{ {
Console.WriteLine("ApplicationInsightsHostingStartup 6");
var settingsFile = Path.Combine(home, "site", "diagnostics", ApplicationInsightsSettingsFile); var settingsFile = Path.Combine(home, "site", "diagnostics", ApplicationInsightsSettingsFile);
var configurationBuilder = new ConfigurationBuilder() var configurationBuilder = new ConfigurationBuilder()
.AddJsonFile(settingsFile, optional: true, reloadOnChange: true); .AddJsonFile(settingsFile, optional: true, reloadOnChange: true);
Console.WriteLine("ApplicationInsightsHostingStartup 7"); services.AddLogging(builder => builder.AddConfiguration(configurationBuilder.Build().GetSection("Logging")));
var config = configurationBuilder.Build().GetSection("Logging");
Console.WriteLine("ApplicationInsightsHostingStartup 8");
services.AddLogging(builder => builder.AddConfiguration(config));
} }
Console.WriteLine("ApplicationInsightsHostingStartup 9");
} }
} }
} }