httpreader: Make linter happy

lib/httpreader/resumable.go

@@ -3,13 +3,17 @@ package httpreader
 import (
 	"context"
 	"fmt"
+	logging "github.com/ipfs/go-log/v2"
+	"go.uber.org/multierr"
 	"io"
 	"net/http"
 	"strconv"
 
 	"golang.org/x/xerrors"
 )
 
+var log = logging.Logger("httpreader")
+
 type ResumableReader struct {
 	ctx           context.Context
 	initialURL    string
@@ -57,7 +61,9 @@ func NewResumableReader(ctx context.Context, url string) (*ResumableReader, erro
 
 	contentLength, err := strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64)
 	if err != nil {
-		resp.Body.Close()
+		if err := resp.Body.Close(); err != nil {
+			err = multierr.Append(err, err)
+		}
 		return nil, err
 	}
 
@@ -100,10 +106,14 @@ func (r *ResumableReader) Read(p []byte) (n int, err error) {
 
 		if err == io.EOF || err == io.ErrUnexpectedEOF {
 			if r.position == r.contentLength {
-				r.reader.Close()
-				return n, err
+				if err := r.reader.Close(); err != nil {
+					log.Warnf("error closing reader: %+v", err)
+				}
+				return n, io.EOF
+			}
+			if err := r.reader.Close(); err != nil {
+				log.Warnf("error closing reader: %+v", err)
 			}
-			r.reader.Close()
 			r.reader = nil
 		} else {
 			return n, err