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

AB#5820 - Initialize the webprofiler in asp.net core

Browse Source
This commit is contained in:
Bjarke Berg
2020-03-25 05:39:25 +01:00
parent 397b25f9ae
commit 92afbfc6fc
10 changed files with 69 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Configuration/Models/HostingSettings.cs
View File

@@ -22,6 +22,6 @@ namespace Umbraco.Configuration.Models
/// Gets a value indicating whether umbraco is running in [debug mode].
/// </summary>
/// <value><c>true</c> if [debug mode]; otherwise, <c>false</c>.</value>
public bool DebugMode => _configuration.GetValue(Prefix+":Debug", false);
public bool DebugMode => _configuration.GetValue(Prefix+"Debug", false);
}
}

3
src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
View File

@@ -22,6 +22,9 @@ namespace Umbraco.Core.Composing
"Umbraco.PublishedCache.NuCache",
"Umbraco.ModelsBuilder.Embedded",
"Umbraco.Examine.Lucene",
"Umbraco.Web.Common",
"Umbraco.Web.BackOffice",
"Umbraco.Web.Website",
};
public DefaultUmbracoAssemblyProvider(Assembly entryPointAssembly)

20
src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
View File

@@ -18,6 +18,7 @@ using Umbraco.Core.Logging;
using Umbraco.Core.Logging.Serilog;
using Umbraco.Core.Persistence;
using Umbraco.Core.Runtime;
using Umbraco.Web.Common.Runtime.Profiler;
namespace Umbraco.Web.BackOffice.AspNetCore
{
@@ -118,7 +119,7 @@ namespace Umbraco.Web.BackOffice.AspNetCore
private static void CreateCompositionRoot(IServiceCollection services)
{
// TODO: This isn't the best to have to resolve the services now but to avoid this will
// require quite a lot of re-work.
// require quite a lot of re-work.
var serviceProvider = services.BuildServiceProvider();
var httpContextAccessor = serviceProvider.GetRequiredService<IHttpContextAccessor>();
@@ -142,11 +143,26 @@ namespace Umbraco.Web.BackOffice.AspNetCore
new AspNetCoreMarchal());
var backOfficeInfo = new AspNetCoreBackOfficeInfo(globalSettings);
var profiler = new LogProfiler(logger);
var profiler = GetWebProfiler(hostingEnvironment, httpContextAccessor);
Current.Initialize(logger, configs, ioHelper, hostingEnvironment, backOfficeInfo, profiler);
}
private static IProfiler GetWebProfiler(Umbraco.Core.Hosting.IHostingEnvironment hostingEnvironment, IHttpContextAccessor httpContextAccessor)
{
// create and start asap to profile boot
if (!hostingEnvironment.IsDebugMode)
{
// should let it be null, that's how MiniProfiler is meant to work,
// but our own IProfiler expects an instance so let's get one
return new VoidProfiler();
}
var webProfiler = new WebProfiler(httpContextAccessor);
webProfiler.Start();
return webProfiler;
}
private class AspNetCoreBootPermissionsChecker : IUmbracoBootPermissionChecker
{
public void ThrowIfNotPermissions()

1
src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
View File

@@ -18,6 +18,7 @@
<ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
<ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
<ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
<ProjectReference Include="..\Umbraco.Web.Common\Umbraco.Web.Common.csproj" />
</ItemGroup>
</Project>

2
src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs → src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
View File

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Hosting;
using Umbraco.Net;
namespace Umbraco.Web.AspNet
namespace Umbraco.Web.Common.AspNetCore
{
public class AspNetCoreUmbracoApplicationLifetime : IUmbracoApplicationLifetime
{

20
src/Umbraco.Web.Common/Extensions/UmbracoRequestServiceCollectionExtensions.cs
View File

@@ -1,20 +0,0 @@
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Web.Common.Middleware;
namespace Umbraco.Web.Common.Extensions
{
public static class UmbracoRequestServiceCollectionExtensions
{
public static IServiceCollection AddUmbracoRequest(this IServiceCollection services)
{
var umbracoRequestLifetime = new UmbracoRequestLifetime();
services.AddSingleton<IUmbracoRequestLifetimeManager>(umbracoRequestLifetime);
services.AddSingleton<IUmbracoRequestLifetime>(umbracoRequestLifetime);
return services;
}
}
}

18
src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComponent.cs Normal file
View File

@@ -0,0 +1,18 @@
using Umbraco.Core.Composing;
namespace Umbraco.Web.Common.Runtime.Profiler
{
public sealed class WebInitialComponent : IComponent
{
public void Initialize()
{
}
public void Terminate()
{
}
}
}

24
src/Umbraco.Web.Common/Runtime/Profiler/WebInitialComposer.cs Normal file
View File

@@ -0,0 +1,24 @@
using Microsoft.AspNetCore.Http;
using Umbraco.Core;
using Umbraco.Core.Composing;
using Umbraco.Net;
using Umbraco.Web.Common.AspNetCore;
using Umbraco.Web.Common.Middleware;
namespace Umbraco.Web.Common.Runtime.Profiler
{
public class WebInitialComposer : ComponentComposer<WebInitialComponent>, ICoreComposer
{
public override void Compose(Composition composition)
{
base.Compose(composition);
var umbracoRequestLifetime = new UmbracoRequestLifetime();
composition.RegisterUnique<IUmbracoRequestLifetimeManager>(factory => umbracoRequestLifetime);
composition.RegisterUnique<IUmbracoRequestLifetime>(factory => umbracoRequestLifetime);
composition.RegisterUnique<IUmbracoApplicationLifetime, AspNetCoreUmbracoApplicationLifetime>();
}
}
}

1
src/Umbraco.Web.UI.NetCore/Startup.cs
View File

@@ -24,7 +24,6 @@ namespace Umbraco.Web.UI.BackOffice
{
services.AddUmbracoConfiguration();
services.AddUmbracoRequest();
services.AddUmbracoCore();
services.AddUmbracoWebsite();
}

3
src/Umbraco.Web.UI.NetCore/appsettings.json
View File

@@ -12,6 +12,9 @@
"AllowedHosts": "*",
"Umbraco": {
"CMS": {
"Hosting": {
"Debug": true
},
"Imaging": {
"Resize": {
"MaxWidth": 5000,