Merge pull request #110212 from aojea/fix_agnhost_sigterm

agnhost: fix sigterm shutdown
This commit is contained in:
Kubernetes Prow Robot 2022-05-25 06:38:44 -07:00 committed by GitHub
commit 1290d6a4c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View File

@ -1 +1 @@
2.38 2.39

View File

@ -175,14 +175,14 @@ func main(cmd *cobra.Command, args []string) {
close(sigTermReceived) close(sigTermReceived)
}() }()
if delayShutdown > 0 { go func() {
go func() { <-sigTermReceived
<-sigTermReceived if delayShutdown > 0 {
log.Printf("Sleeping %d seconds before terminating...", delayShutdown) log.Printf("Sleeping %d seconds before terminating...", delayShutdown)
time.Sleep(time.Duration(delayShutdown) * time.Second) time.Sleep(time.Duration(delayShutdown) * time.Second)
os.Exit(0) }
}() os.Exit(0)
} }()
if httpOverride != "" { if httpOverride != "" {
mux := http.NewServeMux() mux := http.NewServeMux()