summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2020-04-16 12:34:28 -0600
committerMatthew Holt <mholt@users.noreply.github.com>2020-04-16 12:34:28 -0600
commit9a572635f581c57a6d09a107e506ffac2e970b03 (patch)
tree66a86a08f1cd3d4162e865489949b280be02fcb2
parentf5ccb904a3db2bffd980feee685afaa762224cb2 (diff)
admin: Close admin endpoint when shutting down (fixes #3269)
-rw-r--r--sigtrap.go19
1 files changed, 14 insertions, 5 deletions
diff --git a/sigtrap.go b/sigtrap.go
index 88dbb6d..08f03aa 100644
--- a/sigtrap.go
+++ b/sigtrap.go
@@ -53,20 +53,29 @@ func trapSignalsCrossPlatform() {
}
// gracefulStop exits the process as gracefully as possible.
+// It always exits, even if there are errors shutting down.
func gracefulStop(sigName string) {
exitCode := ExitCodeSuccess
+ defer func() {
+ Log().Info("shutdown done", zap.String("signal", sigName))
+ os.Exit(exitCode)
+ }()
err := stopAndCleanup()
if err != nil {
- Log().Error("stopping",
+ Log().Error("stopping config",
zap.String("signal", sigName),
- zap.Error(err),
- )
+ zap.Error(err))
exitCode = ExitCodeFailedQuit
}
- Log().Info("shutdown done", zap.String("signal", sigName))
- os.Exit(exitCode)
+ err = stopAdminServer(adminServer)
+ if err != nil {
+ Log().Error("stopping admin endpoint",
+ zap.String("signal", sigName),
+ zap.Error(err))
+ exitCode = ExitCodeFailedQuit
+ }
}
// Exit codes. Generally, you should NOT