Skip to content

Commit a65dda8

Browse files
committed
Simplify bodyReader.errorIfNotReconnecting
Doh. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
1 parent 92d7d70 commit a65dda8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

docker/body_reader.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,12 @@ func (br *bodyReader) errorIfNotReconnecting(originalErr error, redactedURL stri
229229
logrus.Infof("Reading blob body from %s failed (%v), reconnecting after %d bytes…", redactedURL, originalErr, progress)
230230
return nil
231231
}
232-
if br.lastRetryTime == (time.Time{}) || msSinceLastRetry >= bodyReaderMSSinceLastRetry {
233-
if br.lastRetryTime == (time.Time{}) {
234-
logrus.Infof("Reading blob body from %s failed (%v), reconnecting (first reconnection)…", redactedURL, originalErr)
235-
} else {
236-
logrus.Infof("Reading blob body from %s failed (%v), reconnecting after %.3f ms…", redactedURL, originalErr, msSinceLastRetry)
237-
}
232+
if br.lastRetryTime == (time.Time{}) {
233+
logrus.Infof("Reading blob body from %s failed (%v), reconnecting (first reconnection)…", redactedURL, originalErr)
234+
return nil
235+
}
236+
if msSinceLastRetry >= bodyReaderMSSinceLastRetry {
237+
logrus.Infof("Reading blob body from %s failed (%v), reconnecting after %.3f ms…", redactedURL, originalErr, msSinceLastRetry)
238238
return nil
239239
}
240240
logrus.Debugf("Not reconnecting to %s: insufficient progress %d / time since last retry %.3f ms", redactedURL, progress, msSinceLastRetry)

0 commit comments

Comments
 (0)