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

Merge pull request #7310 from ronaldbarendse/v7/bugfix/miniprofiler-startup

Browse Source 
V7: Discard MiniProfiler results when not in debug mode
This commit is contained in:
Warren Buckley
2020-01-28 16:16:53 +00:00
committed by GitHub
parent b0e2f2d511 262a4cba36
commit 9212d7cdb1
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/Profiling/WebProfiler.cs
View File

@@ -3,6 +3,7 @@ using System.Threading;
using System.Web;
using StackExchange.Profiling;
using StackExchange.Profiling.SqlFormatters;
using StackExchange.Profiling.Storage;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Logging;
@@ -32,6 +33,7 @@ namespace Umbraco.Web.Profiling
MiniProfiler.Settings.SqlFormatter = new SqlServerFormatter();
MiniProfiler.Settings.StackMaxLength = 5000;
MiniProfiler.Settings.ProfilerProvider = _provider;
MiniProfiler.Settings.Storage = new HttpRuntimeCacheStorage(TimeSpan.FromMinutes(30));
//Binds to application events to enable the MiniProfiler with a real HttpRequest
UmbracoApplicationBase.ApplicationInit += UmbracoApplicationApplicationInit;
@@ -82,7 +84,7 @@ namespace Umbraco.Web.Profiling
if (isBootRequest)
_provider.EndBootRequest();
if (isBootRequest || ShouldProfile(sender))
Stop();
Stop(!GlobalSettings.DebugMode);
}
private bool ShouldProfile(object sender)

19
src/Umbraco.Web/Profiling/WebProfilerProvider.cs
View File

@@ -1,10 +1,7 @@
using System;
using System.Linq;
using System.Threading;
using System.Web;
using System.Web.Routing;
using StackExchange.Profiling;
using Umbraco.Core.Configuration;
namespace Umbraco.Web.Profiling
{
@@ -27,20 +24,6 @@ namespace Umbraco.Web.Profiling
{
// booting...
_bootPhase = BootPhase.Boot;
// Remove Mini Profiler routes when not in debug mode
if (GlobalSettings.DebugMode == false)
{
//NOTE: Keep the global fully qualified name, for some reason without it I was getting null refs
var prefix = global::StackExchange.Profiling.MiniProfiler.Settings.RouteBasePath.Replace("~/", string.Empty);
using (RouteTable.Routes.GetWriteLock())
{
var routes = RouteTable.Routes.Where(x => x is Route r && r.Url.StartsWith(prefix)).ToList();
foreach(var r in routes)
RouteTable.Routes.Remove(r);
}
}
}
/// <summary>
@@ -135,4 +118,4 @@ namespace Umbraco.Web.Profiling
}
}
}
}
}