From 411403117671558012873d18cf801e5453278428 Mon Sep 17 00:00:00 2001 From: Todd Persen Date: Tue, 7 Apr 2015 13:07:24 -0700 Subject: [PATCH] WIP: Make `200 OK` the default status code for queries. --- httpd/handler.go | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/httpd/handler.go b/httpd/handler.go index 0d57a1b59c..4707ed31a0 100644 --- a/httpd/handler.go +++ b/httpd/handler.go @@ -243,21 +243,15 @@ func (h *Handler) serveQuery(w http.ResponseWriter, r *http.Request, user *influ for r := range results { // write the status header based on the first result returned in the channel if !statusWritten { + status := http.StatusOK + if r != nil && r.Err != nil { if isAuthorizationError(r.Err) { - w.WriteHeader(http.StatusUnauthorized) - } else if isMeasurementNotFoundError(r.Err) { - w.WriteHeader(http.StatusOK) - } else if isTagNotFoundError(r.Err) { - w.WriteHeader(http.StatusOK) - } else if isFieldNotFoundError(r.Err) { - w.WriteHeader(http.StatusOK) - } else { - w.WriteHeader(http.StatusInternalServerError) + status = http.StatusUnauthorized } - } else { - w.WriteHeader(http.StatusOK) } + + w.WriteHeader(status) statusWritten = true }