mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 05:34:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #726 from prometheus/improve-redirections

Browse source 
Improve web redirection and 404 behavior.
This commit is contained in:
Julius Volz 2015-05-23 16:16:26 +02:00
parent c86f5fdfd1 fcd33bbfd8
commit 837ffcea29
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
web/web.go
View file

@ -65,9 +65,21 @@ func (ws WebService) ServeForever(pathPrefix string) {
http.Error(w, "", 404)
}))
http.Handle(pathPrefix, prometheus.InstrumentHandler(
pathPrefix, ws.StatusHandler,
))
http.HandleFunc("/", prometheus.InstrumentHandlerFunc(pathPrefix, func(rw http.ResponseWriter, req *http.Request) {
// The "/" pattern matches everything, so we need to check
// that we're at the root here.
if req.URL.Path == pathPrefix {
ws.StatusHandler.ServeHTTP(rw, req)
} else if req.URL.Path == strings.TrimRight(pathPrefix, "/") {
http.Redirect(rw, req, pathPrefix, http.StatusFound)
} else if !strings.HasPrefix(req.URL.Path, pathPrefix) {
// We're running under a prefix but the user requested something
// outside of it. Let's see if this page exists under the prefix.
http.Redirect(rw, req, pathPrefix+strings.TrimLeft(req.URL.Path, "/"), http.StatusFound)
} else {
http.NotFound(rw, req)
}
}))
http.Handle(pathPrefix+"alerts", prometheus.InstrumentHandler(
pathPrefix+"alerts", ws.AlertsHandler,
))
@ -103,12 +115,6 @@ func (ws WebService) ServeForever(pathPrefix string) {
http.Handle(pathPrefix+"-/quit", http.HandlerFunc(ws.quitHandler))
}
if pathPrefix != "/" {
http.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, pathPrefix, http.StatusFound)
}))
}
log.Infof("Listening on %s", *listenAddress)
// If we cannot bind to a port, retry after 30 seconds.