RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixup: make signal handlers a bit simpler. 

No need to spawn a goroutine, nor wait for a channel.
Let's just put everything in a single select call.

Signed-off-by: Xavier Nicollet <xnicollet@gmail.com>
This commit is contained in:
Xavier Nicollet 2022-10-17 21:04:10 +01:00 committed by Xavier Nicollet
parent 1045dc0f21
commit 7dd34c6b4c
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/alertmanager/main.go
View File

@ -548,14 +548,11 @@ func run() int {
var ( var (
hup = make(chan os.Signal, 1) hup = make(chan os.Signal, 1)
hupReady = make(chan bool)
term = make(chan os.Signal, 1) term = make(chan os.Signal, 1)
) )
signal.Notify(hup, syscall.SIGHUP) signal.Notify(hup, syscall.SIGHUP)
signal.Notify(term, os.Interrupt, syscall.SIGTERM) signal.Notify(term, os.Interrupt, syscall.SIGTERM)
go func() {
<-hupReady
for { for {
select { select {
case <-hup: case <-hup:
@ -563,15 +560,6 @@ func run() int {
_ = configCoordinator.Reload() _ = configCoordinator.Reload()
case errc := <-webReload: case errc := <-webReload:
errc <- configCoordinator.Reload() errc <- configCoordinator.Reload()
}
}
}()
// Wait for reload or termination signals.
close(hupReady) // Unblock SIGHUP handler.
for {
select {
case <-term: case <-term:
level.Info(logger).Log("msg", "Received SIGTERM, exiting gracefully...") level.Info(logger).Log("msg", "Received SIGTERM, exiting gracefully...")
return 0 return 0