upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-06-08 00:02:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #1204 from hashicorp/fetch-health-params

Browse source 
Refactor fetching sys/health parameters
This commit is contained in:
Vishal Nayak 2016-03-11 10:55:37 -05:00
commit 9e69eba911
1 changed files with 32 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
http/sys_health.go
View file

@ -20,6 +20,19 @@ func handleSysHealth(core *vault.Core) http.Handler {
})
}
func fetchStatusCode(r *http.Request, field string) (int, bool, bool) {
var err error
statusCode := http.StatusOK
if statusCodeStr, statusCodeOk := r.URL.Query()[field]; statusCodeOk {
statusCode, err = strconv.Atoi(statusCodeStr[0])
if err != nil || len(statusCodeStr) < 1 {
return http.StatusBadRequest, false, false
}
return statusCode, true, true
}
return statusCode, false, true
}
func handleSysHealthGet(core *vault.Core, w http.ResponseWriter, r *http.Request) {
// Check if being a standby is allowed for the purpose of a 200 OK
@ -28,47 +41,27 @@ func handleSysHealthGet(core *vault.Core, w http.ResponseWriter, r *http.Request
// FIXME: Change the sealed code to http.StatusServiceUnavailable at some
// point
sealedCode := http.StatusInternalServerError
if code, found, ok := fetchStatusCode(r, "sealedcode"); !ok {
respondError(w, http.StatusBadRequest, nil)
return
} else if found {
sealedCode = code
}
standbyCode := http.StatusTooManyRequests // Consul warning code
if code, found, ok := fetchStatusCode(r, "standbycode"); !ok {
respondError(w, http.StatusBadRequest, nil)
return
} else if found {
standbyCode = code
}
activeCode := http.StatusOK
var err error
sealedCodeStr, sealedCodeOk := r.URL.Query()["sealedcode"]
if sealedCodeOk {
if len(sealedCodeStr) < 1 {
respondError(w, http.StatusBadRequest, nil)
return
}
sealedCode, err = strconv.Atoi(sealedCodeStr[0])
if err != nil {
respondError(w, http.StatusBadRequest, nil)
return
}
}
standbyCodeStr, standbyCodeOk := r.URL.Query()["standbycode"]
if standbyCodeOk {
if len(standbyCodeStr) < 1 {
respondError(w, http.StatusBadRequest, nil)
return
}
standbyCode, err = strconv.Atoi(standbyCodeStr[0])
if err != nil {
respondError(w, http.StatusBadRequest, nil)
return
}
}
activeCodeStr, activeCodeOk := r.URL.Query()["activecode"]
if activeCodeOk {
if len(activeCodeStr) < 1 {
respondError(w, http.StatusBadRequest, nil)
return
}
activeCode, err = strconv.Atoi(activeCodeStr[0])
if err != nil {
respondError(w, http.StatusBadRequest, nil)
return
}
if code, found, ok := fetchStatusCode(r, "activecode"); !ok {
respondError(w, http.StatusBadRequest, nil)
return
} else if found {
activeCode = code
}
// Check system status