Upgraded DisposableTimer to wrap the profiler... now we should really just use DisposableTimer for all profiling.
This commit is contained in:
@@ -99,6 +99,17 @@ namespace Umbraco.Web
|
||||
UmbracoContext.EnsureContext(new HttpContextWrapper(UmbracoApplication.Context), ApplicationContext);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Ensure the current profiler is the web profiler
|
||||
/// </summary>
|
||||
protected override void InitializeProfilerResolver()
|
||||
{
|
||||
base.InitializeProfilerResolver();
|
||||
|
||||
//Set the profiler to be the web profiler
|
||||
ProfilerResolver.Current.SetProfiler(new WebProfiler());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Adds custom types to the ApplicationEventsResolver
|
||||
/// </summary>
|
||||
@@ -240,9 +251,6 @@ namespace Umbraco.Web
|
||||
{
|
||||
base.InitializeResolvers();
|
||||
|
||||
//Set the profiler to be the web profiler
|
||||
ProfilerResolver.Current.SetProfiler(new WebProfiler());
|
||||
|
||||
//set the default RenderMvcController
|
||||
DefaultRenderMvcControllerResolver.Current = new DefaultRenderMvcControllerResolver(typeof(RenderMvcController));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user