Always close sockets

chiafactory · Jul 14, 2021 · e967e8e · e967e8e
1 parent 6ca677a
commit e967e8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/client/client.go b/client/client.go
@@ -191,12 +191,12 @@ func (c *Client) apiRequest(ctx context.Context, method string, endpoint string,
 	}
 	log.Debugf("%s got status code %d for (%s %s)", c, res.StatusCode, method, url)
 
+	defer res.Body.Close()
 	if res.StatusCode != http.StatusOK {
 		return nil, res.StatusCode, fmt.Errorf("invalid response received (%s)", res.Status)
 	}
 
 	responseBody, err := ioutil.ReadAll(res.Body)
-	defer res.Body.Close()
 
 	return responseBody, res.StatusCode, nil
 }

diff --git a/plot/plot.go b/plot/plot.go
@@ -265,6 +265,7 @@ func (p *Plot) getDownloadSize() (fileSize int64, err error) {
 		err = errors.Wrap(err, "error while making the HTTP request to download the file")
 		return
 	}
+	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		err = fmt.Errorf("invalid status code returned (%d) while trying to get download size", resp.StatusCode)
@@ -561,7 +562,7 @@ func (p *Plot) Download(ctx context.Context) (err error) {
 		err = errors.Wrap(err, "error while making the HTTP request to download the file")
 		return
 	}
-
+	defer resp.Body.Close()
 	if resp.StatusCode != expectedStatusCode {
 		err = fmt.Errorf("invalid status code returned (%d)", resp.StatusCode)
 		return
@@ -582,7 +583,6 @@ func (p *Plot) Download(ctx context.Context) (err error) {
 		)
 
 		defer func() {
-			resp.Body.Close()
 			filebuff.Flush()
 			done <- err
 		}()