vbatts/registry
1
0
Fork 0
forked from mirrors/docker-distribution
Code Issues Pull requests Releases Wiki Activity

Merge pull request #590 from mattrobenolt/patch-1

Browse source 
Return valid json from StatusHandler
This commit is contained in:
Olivier Gambier 2015-06-11 09:51:45 -07:00
commit 1ad9ac497c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
health/health.go
View file

@ -195,11 +195,16 @@ func StatusHandler(w http.ResponseWriter, r *http.Request) {
if len(checksStatus) != 0 {
w.WriteHeader(http.StatusServiceUnavailable)
}
err := json.NewEncoder(w).Encode(checksStatus)
encoder := json.NewEncoder(w)
err := encoder.Encode(checksStatus)
// Parsing of the JSON failed. Returning generic error message
if err != nil {
w.Write([]byte("{server_error: 'Could not parse error message'}"))
encoder.Encode(struct {
ServerError string `json:"server_error"`
}{
ServerError: "Could not parse error message",
})
}
} else {
w.WriteHeader(http.StatusNotFound)