set correct return tuple

moira-alert · Feb 4, 2019 · ed40c1a · ed40c1a
1 parent 4704e2a
commit ed40c1a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/metric_source/remote/request.go b/metric_source/remote/request.go
@@ -25,19 +25,20 @@ func (remote *Remote) prepareRequest(from, until int64, target string) (*http.Re
 }
 
 func (remote *Remote) makeRequest(req *http.Request) ([]byte, error) {
+	var body []byte
 	resp, err := remote.client.Do(req)
 	if resp != nil {
 		defer resp.Body.Close()
 	}
 	if err != nil {
-		return nil, err
+		return body, err
 	}
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err = ioutil.ReadAll(resp.Body)
 	if err != nil {
 		return body, err
 	}
 	if resp.StatusCode != 200 {
 		return body, fmt.Errorf("bad response status %d: %s", resp.StatusCode, string(body))
 	}
-	return body, err
+	return body, nil
 }