IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Server: Implement timeout waiting for server to shut down (#33333)

Browse Source 
* tests: Undo cleanup in goroutine

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Server: Implement timeout waiting for it to shut down

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2021-04-30 10:55:59 +02:00
committed by GitHub
parent 492227fa0a
commit ec3d8b590a
4 changed files with 45 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/cmd/grafana-server/main.go
View File

@@ -1,6 +1,7 @@
package main
import (
"context"
"errors"
"flag"
"fmt"
@@ -156,7 +157,9 @@ func executeServer(configFile, homePath, pidFile, packaging string, traceDiagnos
return err
}
go listenToSystemSignals(s)
ctx := context.Background()
go listenToSystemSignals(ctx, s)
if err := s.Run(); err != nil {
code := s.ExitCode(err)
@@ -179,7 +182,7 @@ func validPackaging(packaging string) string {
return "unknown"
}
func listenToSystemSignals(s *server.Server) {
func listenToSystemSignals(ctx context.Context, s *server.Server) {
signalChan := make(chan os.Signal, 1)
sighupChan := make(chan os.Signal, 1)
@@ -193,7 +196,11 @@ func listenToSystemSignals(s *server.Server) {
fmt.Fprintf(os.Stderr, "Failed to reload loggers: %s\n", err)
}
case sig := <-signalChan:
s.Shutdown(fmt.Sprintf("System signal: %s", sig))
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()
if err := s.Shutdown(ctx, fmt.Sprintf("System signal: %s", sig)); err != nil {
fmt.Fprintf(os.Stderr, "Timed out waiting for server to shut down\n")
}
return
}
}