From 3b3457af1420944e9e2ca9670282a94202777f72 Mon Sep 17 00:00:00 2001 From: Kane York Date: Sat, 4 Jun 2016 11:43:37 -0700 Subject: [PATCH] allow 2xx from backend --- socketserver/server/backend.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/socketserver/server/backend.go b/socketserver/server/backend.go index e8d827fa..b7577f6f 100644 --- a/socketserver/server/backend.go +++ b/socketserver/server/backend.go @@ -232,7 +232,7 @@ func (backend *backendInfo) SendAggregatedData(form url.Values) error { if err != nil { return err } - if resp.StatusCode != 200 { + if resp.StatusCode < 200 || resp.StatusCode > 299 { resp.Body.Close() return httpError(resp.StatusCode) } @@ -291,14 +291,12 @@ func (backend *backendInfo) sendTopicNotice(topic string, added bool) error { } defer resp.Body.Close() - respBytes, err := ioutil.ReadAll(resp.Body) - if err != nil { - return err - } - - respStr := string(respBytes) - if respStr != "ok" { - return ErrBackendNotOK{Code: resp.StatusCode, Response: respStr} + if resp.StatusCode < 200 || resp.StatusCode > 299 { + respBytes, err := ioutil.ReadAll(resp.Body) + if err != nil { + return ErrBackendNotOK{Code: resp.StatusCode, Response: fmt.Sprintf("(error reading non-2xx response): %s", err.Error()} + } + return ErrBackendNotOK{Code: resp.StatusCode, Response: string(respBytes)} } backend.lastSuccessLock.Lock()