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

Merge remote-tracking branch 'origin/rel/2.0.0' into dev

This commit is contained in:
Pavel Krymets 2017-07-12 13:47:38 -07:00
parent cec12fdd7d 5ea7030b69
commit b4242d3f3e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,16 +2,12 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
[assembly: HostingStartup(typeof(Microsoft.AspNetCore.ApplicationInsights.HostingStartup.ApplicationInsightsHostingStartup))] [assembly: HostingStartup(typeof(Microsoft.AspNetCore.ApplicationInsights.HostingStartup.ApplicationInsightsHostingStartup))]
@ -52,8 +48,9 @@ namespace Microsoft.AspNetCore.ApplicationInsights.HostingStartup
if (!string.IsNullOrEmpty(home)) if (!string.IsNullOrEmpty(home))
{ {
var settingsFile = Path.Combine(home, "site", "diagnostics", ApplicationInsightsSettingsFile); var settingsFile = Path.Combine(home, "site", "diagnostics", ApplicationInsightsSettingsFile);
var configurationBuilder = new ConfigurationBuilder(); var configurationBuilder = new ConfigurationBuilder()
configurationBuilder.AddJsonFile(settingsFile, optional: true); .AddJsonFile(settingsFile, optional: true, reloadOnChange: true);
services.AddLogging(builder => builder.AddConfiguration(configurationBuilder.Build().GetSection("Logging"))); services.AddLogging(builder => builder.AddConfiguration(configurationBuilder.Build().GetSection("Logging")));
} }
} }