Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
go-libp2p
Commits
98c4e3f6
Commit
98c4e3f6
authored
May 01, 2015
by
Juan Batiz-Benet
Browse files
Merge pull request #1160 from ipfs/fix/dial-error-hiding
Fix/dial error hiding
parents
9058b771
ba120bcd
Changes
1
Show whitespace changes
Inline
Side-by-side
net/swarm/swarm_dial.go
View file @
98c4e3f6
...
@@ -237,7 +237,8 @@ func (s *Swarm) gatedDialAttempt(ctx context.Context, p peer.ID) (*Conn, error)
...
@@ -237,7 +237,8 @@ func (s *Swarm) gatedDialAttempt(ctx context.Context, p peer.ID) (*Conn, error)
log
.
Event
(
ctx
,
"swarmDialBackoffAdd"
,
logdial
)
log
.
Event
(
ctx
,
"swarmDialBackoffAdd"
,
logdial
)
s
.
backf
.
AddBackoff
(
p
)
// let others know to backoff
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
)
log
.
Event
(
ctx
,
"swarmDialBackoffClear"
,
logdial
)
s
.
backf
.
Clear
(
p
)
// okay, no longer need to backoff
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
...
@@ -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
++
{
for
i
:=
0
;
i
<
len
(
remoteAddrs
);
i
++
{
select
{
select
{
case
exitErr
=
<-
errs
:
//
case
exitErr
=
<-
errs
:
//
log
.
Debug
(
exitErr
)
log
.
Debug
(
"dial error: "
,
exitErr
)
case
connC
:=
<-
conns
:
case
connC
:=
<-
conns
:
// take the first + return asap
// take the first + return asap
close
(
foundConn
)
close
(
foundConn
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment