opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-30 18:13:54 +08:00
Code Issues Projects Releases Wiki Activity

bring some errors that were being hidden in the dial sequence to the surface

Browse Source
This commit is contained in:
Jeromy
2015-04-24 14:37:32 -07:00
parent 1b51d9dbf5
commit 194dc2bf7b
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/_workspace/src/github.com/jbenet/go-reuseport/impl_unix.go generated vendored
View File

@ -115,7 +115,9 @@ func dial(dialer net.Dialer, netw, addr string) (c net.Conn, err error) {
// here we just try again 3 times.
for i := 0; i < 3; i++ {
if !deadline.IsZero() && deadline.Before(time.Now()) {
err = errTimeout
if err == nil {
err = errTimeout
}
break
}
@ -355,6 +357,6 @@ var errTimeout = &timeoutError{}
type timeoutError struct{}
func (e *timeoutError) Error() string { return "i/o timeout" }
func (e *timeoutError) Error() string { return "i/o timeout (reuseport)" }
func (e *timeoutError) Timeout() bool { return true }
func (e *timeoutError) Temporary() bool { return true }

5
p2p/net/swarm/swarm_dial.go
View File

@ -237,7 +237,8 @@ func (s *Swarm) gatedDialAttempt(ctx context.Context, p peer.ID) (*Conn, error)
log.Event(ctx, "swarmDialBackoffAdd", logdial)
s.backf.AddBackoff(p) // let others know to backoff
return nil, ErrDialFailed // ok, we failed. try again. (if loop is done, our error is output)
// ok, we failed. try again. (if loop is done, our error is output)
return nil, fmt.Errorf("dial attempt failed: %s", err)
}
log.Event(ctx, "swarmDialBackoffClear", logdial)
s.backf.Clear(p) // okay, no longer need to backoff
@ -416,7 +417,7 @@ func (s *Swarm) dialAddrs(ctx context.Context, d *conn.Dialer, p peer.ID, remote
for i := 0; i < len(remoteAddrs); i++ {
select {
case exitErr = <-errs: //
log.Debug(exitErr)
log.Warning("dial error: ", exitErr)
case connC := <-conns:
// take the first + return asap
close(foundConn)