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

Handle SIGTERM exit code #6526 (#8294)

This commit is contained in:
Chris Ross 2019-03-19 19:15:00 -04:00 committed by GitHub
parent 37a48d897b
commit 0456c9dcc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Hosting/Hosting/src/Internal/WebHostLifetime.cs
View File

@ -13,6 +13,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
private readonly string _shutdownMessage;
private bool _disposed = false;
private bool _exitedGracefully = false;
public WebHostLifetime(CancellationTokenSource cts, ManualResetEventSlim resetEvent, string shutdownMessage)
{
@ -24,6 +25,11 @@ namespace Microsoft.AspNetCore.Hosting.Internal
Console.CancelKeyPress += CancelKeyPress;
}
internal void SetExitedGracefully()
{
_exitedGracefully = true;
}
public void Dispose()
{
if (_disposed)
@ -46,6 +52,12 @@ namespace Microsoft.AspNetCore.Hosting.Internal
private void ProcessExit(object sender, EventArgs eventArgs)
{
Shutdown();
if (_exitedGracefully)
{
// On Linux if the shutdown is triggered by SIGTERM then that's signaled with the 143 exit code.
// Suppress that since we shut down gracefully. https://github.com/aspnet/AspNetCore/issues/6526
Environment.ExitCode = 0;
}
}
private void Shutdown()

2
src/Hosting/Hosting/src/WebHostExtensions.cs
View File

@ -49,6 +49,7 @@ namespace Microsoft.AspNetCore.Hosting
try
{
await host.WaitForTokenShutdownAsync(cts.Token);
lifetime.SetExitedGracefully();
}
finally
{
@ -91,6 +92,7 @@ namespace Microsoft.AspNetCore.Hosting
try
{
await host.RunAsync(cts.Token, "Application started. Press Ctrl+C to shut down.");
lifetime.SetExitedGracefully();
}
finally
{

1
src/Hosting/test/FunctionalTests/ShutdownTests.cs
View File

@ -28,7 +28,6 @@ namespace Microsoft.AspNetCore.Hosting.FunctionalTests
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Windows)]
[OSSkipCondition(OperatingSystems.MacOSX)]
[OSSkipCondition(OperatingSystems.Linux)] // https://github.com/aspnet/AspNetCore-Internal/issues/1687
public async Task ShutdownTestRun()
{
await ExecuteShutdownTest(nameof(ShutdownTestRun), "Run");