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

Change /reload to /-/reload & and fix channel type

This commit is contained in:
Jan Berktold 2015-08-11 12:26:41 +02:00
parent 2bf7048dbb
commit fa929a8345
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/web.go
View File

@ -61,7 +61,7 @@ type Handler struct {
router *route.Router router *route.Router
quitCh chan struct{} quitCh chan struct{}
reloadCh chan bool // boolean saves as placeholder, actual value does not matter reloadCh chan struct{}
options *Options options *Options
statusInfo *PrometheusStatus statusInfo *PrometheusStatus
@ -112,7 +112,7 @@ func New(st local.Storage, qe *promql.Engine, rm *rules.Manager, status *Prometh
h := &Handler{ h := &Handler{
router: router, router: router,
quitCh: make(chan struct{}), quitCh: make(chan struct{}),
reloadCh: make(chan bool), reloadCh: make(chan struct{}),
options: o, options: o,
statusInfo: status, statusInfo: status,
@ -173,7 +173,7 @@ func New(st local.Storage, qe *promql.Engine, rm *rules.Manager, status *Prometh
router.Post("/-/quit", h.quit) router.Post("/-/quit", h.quit)
} }
router.Post("/reload", h.reload) router.Post("/-/reload", h.reload)
router.Get("/debug/*subpath", http.DefaultServeMux.ServeHTTP) router.Get("/debug/*subpath", http.DefaultServeMux.ServeHTTP)
return h return h
@ -184,8 +184,7 @@ func (h *Handler) Quit() <-chan struct{} {
return h.quitCh return h.quitCh
} }
func (h *Handler) Reload() <-chan struct{} {
func (h *Handler) Reload() <-chan bool {
return h.reloadCh return h.reloadCh
} }
@ -303,7 +302,7 @@ func (h *Handler) quit(w http.ResponseWriter, r *http.Request) {
func (h *Handler) reload(w http.ResponseWriter, r *http.Request) { func (h *Handler) reload(w http.ResponseWriter, r *http.Request) {
fmt.Fprintf(w, "Reloading configuration file...") fmt.Fprintf(w, "Reloading configuration file...")
h.reloadCh <- true h.reloadCh <- struct{}{}
} }
func (h *Handler) getTemplateFile(name string) (string, error) { func (h *Handler) getTemplateFile(name string) (string, error) {