Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion connection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ func TestConnectionDailTimeoutAndClose(t *testing.T) {
go func() {
defer wg.Done()
conn, err := DialConnection("tcp", address, time.Nanosecond)
Assert(t, err == nil || strings.Contains(err.Error(), "i/o timeout"))
Assert(t, err == nil || strings.Contains(err.Error(), "i/o timeout"), err)
_ = conn
}()
}
Expand Down
6 changes: 3 additions & 3 deletions net_polldesc.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,18 @@ func (pd *pollDesc) WaitWrite(ctx context.Context) (err error) {
// no need to detach, since poller has done it in OnHup.
return Exception(ErrConnClosed, "by peer")
case <-pd.writeTrigger: // triggered by poller
err = nil
return nil
case <-ctx.Done(): // triggered by ctx
// deregister from poller, upper caller function will close fd
pd.detach()
err = mapErr(ctx.Err())
return mapErr(ctx.Err())
}
// double check close trigger
select {
case <-pd.closeTrigger:
return Exception(ErrConnClosed, "by peer")
default:
return err
return nil
}
}

Expand Down