Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-dms3
Commits
e3eaa154
Commit
e3eaa154
authored
Jan 13, 2015
by
Juan Batiz-Benet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
p2p/net/swarm: fixed bugs in swarm err closes
parent
9b2ccf1e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
p2p/net/swarm/swarm_dial.go
p2p/net/swarm/swarm_dial.go
+2
-2
No files found.
p2p/net/swarm/swarm_dial.go
View file @
e3eaa154
...
@@ -185,7 +185,7 @@ func (s *Swarm) dial(ctx context.Context, p peer.ID) (*Conn, error) {
...
@@ -185,7 +185,7 @@ func (s *Swarm) dial(ctx context.Context, p peer.ID) (*Conn, error) {
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Error
(
"Dial newConnSetup failed. disconnecting."
)
log
.
Error
(
"Dial newConnSetup failed. disconnecting."
)
log
.
Event
(
ctx
,
"dialFailureDisconnect"
,
lgbl
.
NetConn
(
connC
),
lgbl
.
Error
(
err
))
log
.
Event
(
ctx
,
"dialFailureDisconnect"
,
lgbl
.
NetConn
(
connC
),
lgbl
.
Error
(
err
))
swarm
C
.
Close
()
// close the connection. didn't work out :(
conn
C
.
Close
()
// close the connection. didn't work out :(
return
nil
,
err
return
nil
,
err
}
}
...
@@ -241,7 +241,7 @@ func dialConnSetup(ctx context.Context, s *Swarm, connC conn.Conn) (*Conn, error
...
@@ -241,7 +241,7 @@ func dialConnSetup(ctx context.Context, s *Swarm, connC conn.Conn) (*Conn, error
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Error
(
"Dial newConnSetup failed. disconnecting."
)
log
.
Error
(
"Dial newConnSetup failed. disconnecting."
)
log
.
Event
(
ctx
,
"dialFailureDisconnect"
,
lgbl
.
NetConn
(
connC
),
lgbl
.
Error
(
err
))
log
.
Event
(
ctx
,
"dialFailureDisconnect"
,
lgbl
.
NetConn
(
connC
),
lgbl
.
Error
(
err
))
s
warm
C
.
Close
()
// we need to
call this to
make sure psC is Closed.
p
sC
.
Close
()
// we need to make sure psC is Closed.
return
nil
,
err
return
nil
,
err
}
}
...
...
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