This repository was archived by the owner on Dec 19, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 308
Catch exceptions while disposing #136
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ | |
using Microsoft.Framework.ConfigurationModel; | ||
using Microsoft.Framework.DependencyInjection; | ||
using Microsoft.Framework.DependencyInjection.Fallback; | ||
using Microsoft.Framework.Logging; | ||
using Microsoft.Framework.Runtime; | ||
|
||
namespace Microsoft.AspNet.Hosting | ||
|
@@ -52,14 +53,23 @@ public void Main(string[] args) | |
}; | ||
|
||
var engine = services.GetRequiredService<IHostingEngine>(); | ||
var loggerFactory = services.GetRequiredService<ILoggerFactory>(); | ||
var appShutdownService = _serviceProvider.GetRequiredService<IApplicationShutdown>(); | ||
var shutdownHandle = new ManualResetEvent(false); | ||
|
||
var serverShutdown = engine.Start(context); | ||
|
||
appShutdownService.ShutdownRequested.Register(() => | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Dispose should never throw. We should fix Kestrel There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, we should fix Kestrel so it doesn't throw. That said, since Hosting will be interacting with 3rd party components here we should make it more defensive, especially when the consequence is a hang. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah what @Tratcher said. Need to fix both sides. |
||
{ | ||
serverShutdown.Dispose(); | ||
try | ||
{ | ||
serverShutdown.Dispose(); | ||
} | ||
catch (Exception ex) | ||
{ | ||
var logger = loggerFactory.Create<Program>(); | ||
logger.WriteError("TODO: Dispose threw an exception", ex); | ||
} | ||
shutdownHandle.Set(); | ||
}); | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sort the
using
s.