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

Pushing crash handling on app domain into CoreRuntime

Browse Source
This commit is contained in:
Aaron Powell
2018-11-19 22:02:51 +11:00
parent bcf542506d
commit 8a809fe97a
2 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Umbraco.Core/Runtime/CoreRuntime.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Reflection;
using System.Threading;
using System.Web;
using LightInject;
@@ -52,6 +53,9 @@ namespace Umbraco.Core.Runtime
container.RegisterInstance(logger);
// now it is ok to use Current.Logger
ConfigureUnhandledException(logger);
ConfigureAssemblyResolve(logger);
Compose(container);
// prepare essential stuff
@@ -125,6 +129,38 @@ namespace Umbraco.Core.Runtime
return SerilogLogger.CreateWithDefaultConfiguration();
}
protected virtual void ConfigureUnhandledException(ILogger logger)
{
//take care of unhandled exceptions - there is nothing we can do to
// prevent the launch process to go down but at least we can try
// and log the exception
AppDomain.CurrentDomain.UnhandledException += (_, args) =>
{
var exception = (Exception)args.ExceptionObject;
var isTerminating = args.IsTerminating; // always true?
var msg = "Unhandled exception in AppDomain";
if (isTerminating) msg += " (terminating)";
msg += ".";
logger.Error<CoreRuntime>(exception, msg);
};
}
protected virtual void ConfigureAssemblyResolve(ILogger logger)
{
// When an assembly can't be resolved. In here we can do magic with the assembly name and try loading another.
// This is used for loading a signed assembly of AutoMapper (v. 3.1+) without having to recompile old code.
AppDomain.CurrentDomain.AssemblyResolve += (sender, args) =>
{
// ensure the assembly is indeed AutoMapper and that the PublicKeyToken is null before trying to Load again
// do NOT just replace this with 'return Assembly', as it will cause an infinite loop -> stackoverflow
if (args.Name.StartsWith("AutoMapper") && args.Name.EndsWith("PublicKeyToken=null"))
return Assembly.Load(args.Name.Replace(", PublicKeyToken=null", ", PublicKeyToken=be96cd2c38ef1005"));
return null;
};
}
private void AquireMainDom(IServiceFactory container)
{
using (var timer = ProfilingLogger.DebugDuration<CoreRuntime>("Acquiring MainDom.", "Aquired."))

36
src/Umbraco.Web/UmbracoApplicationBase.cs
View File

@@ -58,42 +58,6 @@ namespace Umbraco.Web
// get runtime & boot
_runtime = GetRuntime();
_runtime.Boot(container);
var logger = container.GetInstance<ILogger>();
ConfigureUnhandledException(logger);
ConfigureAssemblyResolve(logger);
}
protected virtual void ConfigureUnhandledException(ILogger logger)
{
//take care of unhandled exceptions - there is nothing we can do to
// prevent the entire w3wp process to go down but at least we can try
// and log the exception
AppDomain.CurrentDomain.UnhandledException += (_, args) =>
{
var exception = (Exception)args.ExceptionObject;
var isTerminating = args.IsTerminating; // always true?
var msg = "Unhandled exception in AppDomain";
if (isTerminating) msg += " (terminating)";
msg += ".";
logger.Error<UmbracoApplicationBase>(exception, msg);
};
}
protected virtual void ConfigureAssemblyResolve(ILogger logger)
{
// When an assembly can't be resolved. In here we can do magic with the assembly name and try loading another.
// This is used for loading a signed assembly of AutoMapper (v. 3.1+) without having to recompile old code.
AppDomain.CurrentDomain.AssemblyResolve += (sender, args) =>
{
// ensure the assembly is indeed AutoMapper and that the PublicKeyToken is null before trying to Load again
// do NOT just replace this with 'return Assembly', as it will cause an infinite loop -> stackoverflow
if (args.Name.StartsWith("AutoMapper") && args.Name.EndsWith("PublicKeyToken=null"))
return Assembly.Load(args.Name.Replace(", PublicKeyToken=null", ", PublicKeyToken=be96cd2c38ef1005"));
return null;
};
}
// called by ASP.NET (auto event wireup) once per app domain