Thanks to visit codestin.com
Credit goes to github.com

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

fix: Continue attempting connections no matter what #412

Merged
merged 6 commits into from
Aug 11, 2021
Merged

fix: Continue attempting connections no matter what #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49752e7
fix: Continue accepting connections after yamux session EOFs
kylecarbs Aug 11, 2021
7293c8d
Add verbosity to timeout
kylecarbs Aug 11, 2021
1143e50
Revert test
kylecarbs Aug 11, 2021
9a145c6
Revert test change
kylecarbs Aug 11, 2021
6c00c38
Never exit when connection fails
kylecarbs Aug 11, 2021
8bcea86
Remove useless log
kylecarbs Aug 11, 2021
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
1 change: 1 addition & 0 deletions internal/cmd/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ coder agent start --coder-url https://my-coder.com --token xxxx-xxxx
return xerrors.Errorf("listen: %w", err)
}
defer func() {
log.Info(ctx, "closing wsnet listener")
err := listener.Close()
if err != nil {
log.Error(ctx, "close listener", slog.Error(err))
Expand Down
10 changes: 3 additions & 7 deletions wsnet/listen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func Listen(ctx context.Context, log slog.Logger, broker string, turnProxyAuthTo
default:
}

if errors.Is(err, io.EOF) || errors.Is(err, yamux.ErrKeepAliveTimeout) {
if err != nil {
l.log.Warn(ctx, "disconnected from broker", slog.Error(err))

// If we hit an EOF, then the connection to the broker
Expand All @@ -88,14 +88,11 @@ func Listen(ctx context.Context, log slog.Logger, broker string, turnProxyAuthTo
if err == nil || errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
break
}
l.log.Warn(ctx, "connecting to broker failed", slog.Error(err))
}
ticker.Stop()
}
if err != nil {
l.acceptError = err
_ = l.Close()
break
}
l.log.Info(ctx, "connected to broker")
}
}()
return l, nil
Expand All @@ -106,7 +103,6 @@ type listener struct {
turnProxyAuthToken string

log slog.Logger
acceptError error
ws *websocket.Conn
connClosers []io.Closer
connClosersMut sync.Mutex
Expand Down