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

Review feedback.

Browse source 
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
This commit is contained in:
Tom Wilkie 2018-07-25 13:17:10 +01:00
parent f83155b11e
commit 901e6d1f82
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
web/api/v1/api.go
View file

@ -843,7 +843,18 @@ func (api *API) respond(w http.ResponseWriter, data interface{}) {
} }
func (api *API) respondError(w http.ResponseWriter, apiErr *apiError, data interface{}) { func (api *API) respondError(w http.ResponseWriter, apiErr *apiError, data interface{}) {
w.Header().Set("Content-Type", "application/json") json := jsoniter.ConfigCompatibleWithStandardLibrary
b, err := json.Marshal(&response{
Status: statusError,
ErrorType: apiErr.typ,
Error: apiErr.err.Error(),
Data: data,
})
if err != nil {
level.Error(api.logger).Log("msg", "error marshalling json response", "err", err)
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
var code int var code int
switch apiErr.typ { switch apiErr.typ {
@ -860,22 +871,9 @@ func (api *API) respondError(w http.ResponseWriter, apiErr *apiError, data inter
default: default:
code = http.StatusInternalServerError code = http.StatusInternalServerError
} }
w.WriteHeader(code)
json := jsoniter.ConfigCompatibleWithStandardLibrary w.Header().Set("Content-Type", "application/json")
b, err := json.Marshal(&response{ w.WriteHeader(code)
Status: statusError,
ErrorType: apiErr.typ,
Error: apiErr.err.Error(),
Data: data,
})
if err != nil {
return
}
if err != nil {
level.Error(api.logger).Log("msg", "error marshalling json response", "err", err)
return
}
if n, err := w.Write(b); err != nil { if n, err := w.Write(b); err != nil {
level.Error(api.logger).Log("msg", "error writing response", "n", n, "err", err) level.Error(api.logger).Log("msg", "error writing response", "n", n, "err", err)
} }