httpreader: Make linter happy
This commit is contained in:
parent
a7d29c9564
commit
24945a906a
@ -7,9 +7,13 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
|
logging "github.com/ipfs/go-log/v2"
|
||||||
|
"go.uber.org/multierr"
|
||||||
"golang.org/x/xerrors"
|
"golang.org/x/xerrors"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var log = logging.Logger("httpreader")
|
||||||
|
|
||||||
type ResumableReader struct {
|
type ResumableReader struct {
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
initialURL string
|
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)
|
contentLength, err := strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
resp.Body.Close()
|
if err = resp.Body.Close(); err != nil {
|
||||||
|
err = multierr.Append(err, err)
|
||||||
|
}
|
||||||
return nil, 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 err == io.EOF || err == io.ErrUnexpectedEOF {
|
||||||
if r.position == r.contentLength {
|
if r.position == r.contentLength {
|
||||||
r.reader.Close()
|
if err := r.reader.Close(); err != nil {
|
||||||
return n, err
|
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
|
r.reader = nil
|
||||||
} else {
|
} else {
|
||||||
return n, err
|
return n, err
|
||||||
|
Loading…
Reference in New Issue
Block a user