mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Guard closing quitCh with sync.Once to prevent double close (#8242)

Browse source 
* Guard closing quitCh with sync.Once to prevent double close

Signed-off-by: Mitsuo Heijo <mitsuo.heijo@gmail.com>
This commit is contained in:
Mitsuo Heijo 2020-12-02 17:39:54 +09:00 committed by GitHub
parent acee998df6
commit 8b64b70fe4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
web/web.go
View file

@ -186,6 +186,7 @@ type Handler struct {
router *route.Router router *route.Router
quitCh chan struct{} quitCh chan struct{}
quitOnce sync.Once
reloadCh chan chan error reloadCh chan chan error
options *Options options *Options
config *config.Config config *config.Config
@ -918,12 +919,14 @@ func (h *Handler) version(w http.ResponseWriter, r *http.Request) {
} }
func (h *Handler) quit(w http.ResponseWriter, r *http.Request) { func (h *Handler) quit(w http.ResponseWriter, r *http.Request) {
select { var closed bool
case <-h.quitCh: h.quitOnce.Do(func() {
fmt.Fprintf(w, "Termination already in progress.") closed = true
default:
fmt.Fprintf(w, "Requesting termination... Goodbye!")
close(h.quitCh) close(h.quitCh)
fmt.Fprintf(w, "Requesting termination... Goodbye!")
})
if !closed {
fmt.Fprintf(w, "Termination already in progress.")
} }
} }