yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Splits profiler so it doesn't have to take a dependency since we don't want to pre-resolve. Adds enrichers to the container.

Browse Source
This commit is contained in:
Shannon
2020-04-22 15:23:51 +10:00
parent 2ef8f26b28
commit 18b285f088
19 changed files with 140 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
View File

@@ -177,14 +177,11 @@ namespace Umbraco.Web.Common.Extensions
// TODO: We need to avoid this, surely there's a way? See ContainerTests.BuildServiceProvider_Before_Host_Is_Configured
var serviceProvider = services.BuildServiceProvider();
var httpContextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
configs = serviceProvider.GetService<Configs>();
if (configs == null)
throw new InvalidOperationException($"Could not resolve type {typeof(Configs)} from the container, ensure {nameof(AddUmbracoConfiguration)} is called before calling {nameof(AddUmbracoCore)}");
var hostingSettings = configs.Hosting();
var coreDebug = configs.CoreDebug();
var globalSettings = configs.Global();
hostingEnvironment = new AspNetCoreHostingEnvironment(hostingSettings, webHostEnvironment);
@@ -192,7 +189,7 @@ namespace Umbraco.Web.Common.Extensions
logger = AddLogger(services, hostingEnvironment, loggingConfiguration);
backOfficeInfo = new AspNetCoreBackOfficeInfo(globalSettings);
profiler = GetWebProfiler(hostingEnvironment, httpContextAccessor);
profiler = GetWebProfiler(hostingEnvironment);
return services;
}
@@ -238,7 +235,7 @@ namespace Umbraco.Web.Common.Extensions
return services;
}
private static IProfiler GetWebProfiler(Umbraco.Core.Hosting.IHostingEnvironment hostingEnvironment, IHttpContextAccessor httpContextAccessor)
private static IProfiler GetWebProfiler(Umbraco.Core.Hosting.IHostingEnvironment hostingEnvironment)
{
// create and start asap to profile boot
if (!hostingEnvironment.IsDebugMode)
@@ -248,7 +245,7 @@ namespace Umbraco.Web.Common.Extensions
return new VoidProfiler();
}
var webProfiler = new WebProfiler(httpContextAccessor);
var webProfiler = new WebProfiler();
webProfiler.StartBoot();
return webProfiler;