Merge branch temp8 into temp8-di2690

This commit is contained in:
Stephan
2018-10-08 19:22:20 +02:00
575 changed files with 21133 additions and 20521 deletions

View File

@@ -483,7 +483,10 @@ namespace Umbraco.Web
app.BeginRequest += (sender, e) =>
{
var httpContext = ((HttpApplication) sender).Context;
_logger.Verbose<UmbracoModule>("Begin request {RequestUrl}", httpContext.Request.Url);
LogHttpRequest.TryGetCurrentHttpRequestId(out var httpRequestId);
_logger.Verbose<UmbracoModule>("Begin request [{HttpRequestId}]: {RequestUrl}", httpRequestId, httpContext.Request.Url);
BeginRequest(new HttpContextWrapper(httpContext));
};
@@ -526,7 +529,9 @@ namespace Umbraco.Web
if (UmbracoContext.Current != null && UmbracoContext.Current.IsFrontEndUmbracoRequest)
{
_logger.Verbose<UmbracoModule>("End Request {RequestUrl} ({RequestDuration}ms)", httpContext.Request.Url, DateTime.Now.Subtract(UmbracoContext.Current.ObjectCreated).TotalMilliseconds);
LogHttpRequest.TryGetCurrentHttpRequestId(out var httpRequestId);
_logger.Verbose<UmbracoModule>("End Request [{HttpRequestId}]: {RequestUrl} ({RequestDuration}ms)", httpRequestId, httpContext.Request.Url, DateTime.Now.Subtract(UmbracoContext.Current.ObjectCreated).TotalMilliseconds);
}
UmbracoModule.OnEndRequest(this, new UmbracoRequestEventArgs(UmbracoContext.Current, new HttpContextWrapper(httpContext)));