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

Merge remote-tracking branch 'origin/v8/8.6' into v8/8.8

Browse Source 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Logging/WebProfilerComponent.cs
This commit is contained in:
Claus
2020-10-01 08:55:28 +02:00
parent 811f27cb01 f24c54acad
commit 94d4fef088
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Web/Logging/WebProfilerComponent.cs
View File

@@ -39,21 +39,20 @@ namespace Umbraco.Web.Logging
public void Terminate()
{
UmbracoApplicationBase.ApplicationInit -= InitializeApplication;
foreach (var t in _terminate) t();
}
private void InitializeApplication(object sender, EventArgs args)
{
if (!(sender is HttpApplication app)) return;
// for *each* application (this will run more than once)
void beginRequest(object s, EventArgs a) => _profiler.UmbracoApplicationBeginRequest(s, a);
app.BeginRequest += beginRequest;
_terminate.Add(() => app.BeginRequest -= beginRequest);
void endRequest(object s, EventArgs a) => _profiler.UmbracoApplicationEndRequest(s, a);
app.EndRequest += endRequest;
_terminate.Add(() => app.EndRequest -= endRequest);
// NOTE: We do not unbind these events ... because you just can't do that for HttpApplication events, they will
// be removed when the app dies.
app.BeginRequest += BeginRequest;
app.EndRequest += EndRequest;
}
private void BeginRequest(object s, EventArgs a) => _profiler.UmbracoApplicationBeginRequest(s, a);
private void EndRequest(object s, EventArgs a) => _profiler.UmbracoApplicationEndRequest(s, a);
}
}