huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #136 from Tragetaschen/shutdown-dispose-exception 

Catch exceptions while disposing
This commit is contained in:
David Fowler 2015-01-04 08:52:14 -08:00
parent 217f9ca3d3 6cd5744383
commit d9237b3a08
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Microsoft.AspNet.Hosting/Program.cs
View File

@ -8,6 +8,7 @@ using System.Threading.Tasks;
using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.ConfigurationModel;
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.DependencyInjection.Fallback; using Microsoft.Framework.DependencyInjection.Fallback;
using Microsoft.Framework.Logging;
using Microsoft.Framework.Runtime; using Microsoft.Framework.Runtime;
namespace Microsoft.AspNet.Hosting namespace Microsoft.AspNet.Hosting
@ -52,6 +53,7 @@ namespace Microsoft.AspNet.Hosting
}; };
var engine = services.GetRequiredService<IHostingEngine>(); var engine = services.GetRequiredService<IHostingEngine>();
var loggerFactory = services.GetRequiredService<ILoggerFactory>();
var appShutdownService = _serviceProvider.GetRequiredService<IApplicationShutdown>(); var appShutdownService = _serviceProvider.GetRequiredService<IApplicationShutdown>();
var shutdownHandle = new ManualResetEvent(false); var shutdownHandle = new ManualResetEvent(false);
@ -59,7 +61,15 @@ namespace Microsoft.AspNet.Hosting
appShutdownService.ShutdownRequested.Register(() => appShutdownService.ShutdownRequested.Register(() =>
{ {
serverShutdown.Dispose(); try
{
serverShutdown.Dispose();
}
catch (Exception ex)
{
var logger = loggerFactory.Create<Program>();
logger.WriteError("TODO: Dispose threw an exception", ex);
}
shutdownHandle.Set(); shutdownHandle.Set();
}); });