Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

fix: wsnet.(*Dialer).DialContext hangs forever if ctx is cancelled #425

Merged
merged 1 commit into from
Sep 2, 2021
Merged

fix: wsnet.(*Dialer).DialContext hangs forever if ctx is cancelled #425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions wsnet/dial.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,19 +392,22 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (net.
ctx, cancel := context.WithTimeout(ctx, time.Second*5)
defer cancel()

errCh := make(chan error)
errCh := make(chan error, 1)
go func() {
defer close(errCh)

var res DialChannelResponse
err = json.NewDecoder(rw).Decode(&res)
if err != nil {
errCh <- fmt.Errorf("read dial response: %w", err)
return
}

d.log.Debug(ctx, "dial response", slog.F("res", res))
if res.Err == "" {
close(errCh)
return
}

err := errors.New(res.Err)
if res.Code == CodeDialErr {
err = &net.OpError{
Expand Down