lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: ensure Retriable errors are wrapped only once

Browse Source
This commit is contained in:
Taylor Blau 2016-08-24 10:39:20 -06:00
parent 89f37f4740
commit 34066887eb
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/iotools.go
View File

@ -98,10 +98,16 @@ func NewRetriableReader(r io.Reader) io.Reader {
func (r *RetriableReader) Read(b []byte) (int, error) {
n, err := r.reader.Read(b)
// EOF is a successful response as it is used to signal a graceful end of input
// c.f. https://git.io/v6riQ
if err == nil || err == io.EOF {
// EOF is a successful response as it is used to signal a graceful end
// of input c.f. https://git.io/v6riQ
//
// Otherwise, if the error is non-nill and already retriable (in the
// case that the underlying reader `r.reader` is itself a
// `*RetriableReader`, return the error wholesale:
if err == nil || err == io.EOF || errors.IsRetriableError(err) {
return n, err
}
return n, errors.NewRetriableError(err)
}