From f83155b11efd214ec6b6383d7f9396c24c7a6bf6 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Fri, 13 Jul 2018 19:31:23 +0100 Subject: [PATCH] Review feedback. Signed-off-by: Tom Wilkie --- web/api/v1/api.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/api/v1/api.go b/web/api/v1/api.go index 17a11d7d37..fe9c5ed4ea 100644 --- a/web/api/v1/api.go +++ b/web/api/v1/api.go @@ -824,9 +824,6 @@ func mergeLabels(primary, secondary []*prompb.Label) []*prompb.Label { } func (api *API) respond(w http.ResponseWriter, data interface{}) { - w.Header().Set("Content-Type", "application/json") - w.WriteHeader(http.StatusOK) - json := jsoniter.ConfigCompatibleWithStandardLibrary b, err := json.Marshal(&response{ Status: statusSuccess, @@ -834,8 +831,12 @@ func (api *API) respond(w http.ResponseWriter, data interface{}) { }) if err != nil { level.Error(api.logger).Log("msg", "error marshalling json response", "err", err) + http.Error(w, err.Error(), http.StatusInternalServerError) return } + + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(http.StatusOK) if n, err := w.Write(b); err != nil { level.Error(api.logger).Log("msg", "error writing response", "n", n, "err", err) }