forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 01:43:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

p2p: trying to fix deadlock on discovery tests

Browse source
This commit is contained in:
Anton Evangelatov 2018-02-14 14:14:25 +01:00
parent 0e55745d53
commit 411b9a9cdf
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
p2p/rlpx.go
View file

@ -108,8 +108,9 @@ func (t *rlpx) close(err error) {
// Tell the remote end why we're disconnecting if possible. // Tell the remote end why we're disconnecting if possible.
if t.rw != nil { if t.rw != nil {
if r, ok := err.(DiscReason); ok && r != DiscNetworkError { if r, ok := err.(DiscReason); ok && r != DiscNetworkError {
t.fd.SetWriteDeadline(time.Now().Add(discWriteTimeout)) if err2 := t.fd.SetWriteDeadline(time.Now().Add(discWriteTimeout)); err2 != nil {
SendItems(t.rw, discMsg, r) SendItems(t.rw, discMsg, r)
}
} }
} }
t.fd.Close() t.fd.Close()