github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-22 10:14:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

admin: Close admin endpoint when shutting down (fixes #3269)

Browse Source
This commit is contained in:
Matthew Holt 2020-04-16 12:34:28 -06:00
parent f5ccb904a3
commit 9a572635f5
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sigtrap.go
View File

@ -53,20 +53,29 @@ func trapSignalsCrossPlatform() {
} }
// gracefulStop exits the process as gracefully as possible. // gracefulStop exits the process as gracefully as possible.
// It always exits, even if there are errors shutting down.
func gracefulStop(sigName string) { func gracefulStop(sigName string) {
exitCode := ExitCodeSuccess exitCode := ExitCodeSuccess
defer func() {
Log().Info("shutdown done", zap.String("signal", sigName))
os.Exit(exitCode)
}()
err := stopAndCleanup() err := stopAndCleanup()
if err != nil { if err != nil {
Log().Error("stopping", Log().Error("stopping config",
zap.String("signal", sigName), zap.String("signal", sigName),
zap.Error(err), zap.Error(err))
)
exitCode = ExitCodeFailedQuit exitCode = ExitCodeFailedQuit
} }
Log().Info("shutdown done", zap.String("signal", sigName)) err = stopAdminServer(adminServer)
os.Exit(exitCode) if err != nil {
Log().Error("stopping admin endpoint",
zap.String("signal", sigName),
zap.Error(err))
exitCode = ExitCodeFailedQuit
}
} }
// Exit codes. Generally, you should NOT // Exit codes. Generally, you should NOT