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

Removes the abstraction on the profiler, no need for a resolver, it will work in unit tests and we can override the provider if needed.

Browse Source 
Added better support for MVC profiling by using the built in ProfilingViewEngine and ProfilingActionFilter.
This commit is contained in:
Shannon Deminick
2013-05-12 19:05:49 -10:00
parent 3fd3bf0fda
commit cb8d080f1d
22 changed files with 362 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

290
src/Umbraco.Core/Profiling/WebProfiler.cs
View File

@@ -1,161 +1,161 @@
using System;
using System.Web;
using StackExchange.Profiling;
using Umbraco.Core.Configuration;
using Umbraco.Core.Logging;
//using System;
//using System.Web;
//using StackExchange.Profiling;
//using Umbraco.Core.Configuration;
//using Umbraco.Core.Logging;
namespace Umbraco.Core.Profiling
{
/// <summary>
/// A profiler used for web based activity based on the MiniProfiler framework
/// </summary>
public class WebProfiler : IProfiler
{
//namespace Umbraco.Core.Profiling
//{
// /// <summary>
// /// A profiler used for web based activity based on the MiniProfiler framework
// /// </summary>
// public class WebProfiler : IProfiler
// {
/// <summary>
/// Constructor
/// </summary>
/// <remarks>
/// Binds to application events to enable the MiniProfiler
/// </remarks>
internal WebProfiler()
{
UmbracoApplicationBase.ApplicationInit += UmbracoApplicationApplicationInit;
}
// /// <summary>
// /// Constructor
// /// </summary>
// /// <remarks>
// /// Binds to application events to enable the MiniProfiler
// /// </remarks>
// internal WebProfiler()
// {
// UmbracoApplicationBase.ApplicationInit += UmbracoApplicationApplicationInit;
// }
/// <summary>
/// Handle the Init event o fthe UmbracoApplication which allows us to subscribe to the HttpApplication events
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void UmbracoApplicationApplicationInit(object sender, EventArgs e)
{
var app = sender as HttpApplication;
if (app == null) return;
// /// <summary>
// /// Handle the Init event o fthe UmbracoApplication which allows us to subscribe to the HttpApplication events
// /// </summary>
// /// <param name="sender"></param>
// /// <param name="e"></param>
// void UmbracoApplicationApplicationInit(object sender, EventArgs e)
// {
// var app = sender as HttpApplication;
// if (app == null) return;
if (SystemUtilities.GetCurrentTrustLevel() < AspNetHostingPermissionLevel.High)
{
//If we don't have a high enough trust level we cannot bind to the events
LogHelper.Info<WebProfiler>("Cannot start the WebProfiler since the application is running in Medium trust");
}
else
{
app.BeginRequest += UmbracoApplicationBeginRequest;
app.EndRequest += UmbracoApplicationEndRequest;
}
}
// if (SystemUtilities.GetCurrentTrustLevel() < AspNetHostingPermissionLevel.High)
// {
// //If we don't have a high enough trust level we cannot bind to the events
// LogHelper.Info<WebProfiler>("Cannot start the WebProfiler since the application is running in Medium trust");
// }
// else
// {
// app.BeginRequest += UmbracoApplicationBeginRequest;
// app.EndRequest += UmbracoApplicationEndRequest;
// }
// }
/// <summary>
/// Handle the begin request event
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void UmbracoApplicationEndRequest(object sender, EventArgs e)
{
if (GlobalSettings.DebugMode == false) return;
var request = TryGetRequest(sender);
if (request.Success == false) return;
if (request.Result.Url.IsClientSideRequest()) return;
if (string.IsNullOrEmpty(request.Result["umbDebug"]) == false)
{
//stop the profiler
Stop();
}
}
// /// <summary>
// /// Handle the begin request event
// /// </summary>
// /// <param name="sender"></param>
// /// <param name="e"></param>
// void UmbracoApplicationEndRequest(object sender, EventArgs e)
// {
// if (GlobalSettings.DebugMode == false) return;
// var request = TryGetRequest(sender);
// if (request.Success == false) return;
// if (request.Result.Url.IsClientSideRequest()) return;
// if (string.IsNullOrEmpty(request.Result["umbDebug"]) == false)
// {
// //stop the profiler
// Stop();
// }
// }
/// <summary>
/// Handle the end request event
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void UmbracoApplicationBeginRequest(object sender, EventArgs e)
{
if (GlobalSettings.DebugMode == false) return;
var request = TryGetRequest(sender);
if (request.Success == false) return;
if (request.Result.Url.IsClientSideRequest()) return;
if (string.IsNullOrEmpty(request.Result["umbDebug"]) == false)
{
//start the profiler
Start();
}
}
// /// <summary>
// /// Handle the end request event
// /// </summary>
// /// <param name="sender"></param>
// /// <param name="e"></param>
// void UmbracoApplicationBeginRequest(object sender, EventArgs e)
// {
// if (GlobalSettings.DebugMode == false) return;
// var request = TryGetRequest(sender);
// if (request.Success == false) return;
// if (request.Result.Url.IsClientSideRequest()) return;
// if (string.IsNullOrEmpty(request.Result["umbDebug"]) == false)
// {
// //start the profiler
// Start();
// }
// }
/// <summary>
/// Render the UI to display the profiler
/// </summary>
/// <returns></returns>
/// <remarks>
/// Generally used for HTML displays
/// </remarks>
public string Render()
{
return MiniProfiler.RenderIncludes().ToString();
}
// /// <summary>
// /// Render the UI to display the profiler
// /// </summary>
// /// <returns></returns>
// /// <remarks>
// /// Generally used for HTML displays
// /// </remarks>
// public string Render()
// {
// return MiniProfiler.RenderIncludes().ToString();
// }
/// <summary>
/// Profile a step
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
/// <remarks>
/// Use the 'using(' syntax
/// </remarks>
public IDisposable Step(string name)
{
if (GlobalSettings.DebugMode == false) return null;
// /// <summary>
// /// Profile a step
// /// </summary>
// /// <param name="name"></param>
// /// <returns></returns>
// /// <remarks>
// /// Use the 'using(' syntax
// /// </remarks>
// public IDisposable Step(string name)
// {
// if (GlobalSettings.DebugMode == false) return null;
return MiniProfiler.Current.Step(name);
}
// return MiniProfiler.Current.Step(name);
// }
/// <summary>
/// Start the profiler
/// </summary>
public void Start()
{
if (GlobalSettings.DebugMode == false) return;
//will not run in medium trust
if (SystemUtilities.GetCurrentTrustLevel() < AspNetHostingPermissionLevel.High) return;
// /// <summary>
// /// Start the profiler
// /// </summary>
// public void Start()
// {
// if (GlobalSettings.DebugMode == false) return;
// //will not run in medium trust
// if (SystemUtilities.GetCurrentTrustLevel() < AspNetHostingPermissionLevel.High) return;
MiniProfiler.Start();
}
// MiniProfiler.Start();
// }
/// <summary>
/// Start the profiler
/// </summary>
/// <remarks>
/// set discardResults to false when you want to abandon all profiling, this is useful for
/// when someone is not authenticated or you want to clear the results based on some other mechanism.
/// </remarks>
public void Stop(bool discardResults = false)
{
if (GlobalSettings.DebugMode == false) return;
//will not run in medium trust
if (SystemUtilities.GetCurrentTrustLevel() < AspNetHostingPermissionLevel.High) return;
// /// <summary>
// /// Start the profiler
// /// </summary>
// /// <remarks>
// /// set discardResults to false when you want to abandon all profiling, this is useful for
// /// when someone is not authenticated or you want to clear the results based on some other mechanism.
// /// </remarks>
// public void Stop(bool discardResults = false)
// {
// if (GlobalSettings.DebugMode == false) return;
// //will not run in medium trust
// if (SystemUtilities.GetCurrentTrustLevel() < AspNetHostingPermissionLevel.High) return;
MiniProfiler.Stop(discardResults);
}
// MiniProfiler.Stop(discardResults);
// }
/// <summary>
/// Gets the request object from the app instance if it is available
/// </summary>
/// <param name="sender">The application object</param>
/// <returns></returns>
private Attempt<HttpRequestBase> TryGetRequest(object sender)
{
var app = sender as HttpApplication;
if (app == null) return Attempt<HttpRequestBase>.False;
// /// <summary>
// /// Gets the request object from the app instance if it is available
// /// </summary>
// /// <param name="sender">The application object</param>
// /// <returns></returns>
// private Attempt<HttpRequestBase> TryGetRequest(object sender)
// {
// var app = sender as HttpApplication;
// if (app == null) return Attempt<HttpRequestBase>.False;
try
{
var req = app.Request;
return new Attempt<HttpRequestBase>(true, new HttpRequestWrapper(req));
}
catch (HttpException ex)
{
return new Attempt<HttpRequestBase>(ex);
}
}
// try
// {
// var req = app.Request;
// return new Attempt<HttpRequestBase>(true, new HttpRequestWrapper(req));
// }
// catch (HttpException ex)
// {
// return new Attempt<HttpRequestBase>(ex);
// }
// }
}
}
// }
//}