Commit3ebd102

authored

fix: Continue attempting connections no matter what (#412)

* fix: Continue accepting connections after yamux session EOFs* Add verbosity to timeout* Revert test* Revert test change* Never exit when connection fails* Remove useless log

1 parent9244ee8 commit3ebd102Copy full SHA for 3ebd102

File tree

2 files changed

-7

lines changed

internal/cmd
- agent.go
wsnet
- listen.go

2 files changed

-7

lines changed

`‎internal/cmd/agent.go`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ coder agent start --coder-url https://my-coder.com --token xxxx-xxxx`
`84`	`84`	`returnxerrors.Errorf("listen: %w",err)`
`85`	`85`	`}`
`86`	`86`	`deferfunc() {`
	`87`	`+log.Info(ctx,"closing wsnet listener")`
`87`	`88`	`err:=listener.Close()`
`88`	`89`	`iferr!=nil {`
`89`	`90`	`log.Error(ctx,"close listener",slog.Error(err))`

`‎wsnet/listen.go`

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func Listen(ctx context.Context, log slog.Logger, broker string, turnProxyAuthTo`
`71`	`71`	`default:`
`72`	`72`	`}`
`73`	`73`
`74`		`-iferrors.Is(err,io.EOF)\|\|errors.Is(err,yamux.ErrKeepAliveTimeout) {`
	`74`	`+iferr!=nil {`
`75`	`75`	`l.log.Warn(ctx,"disconnected from broker",slog.Error(err))`
`76`	`76`
`77`	`77`	`// If we hit an EOF, then the connection to the broker`
`@@ -88,14 +88,11 @@ func Listen(ctx context.Context, log slog.Logger, broker string, turnProxyAuthTo`
`88`	`88`	`iferr==nil\|\|errors.Is(err,context.Canceled)\|\|errors.Is(err,context.DeadlineExceeded) {`
`89`	`89`	`break`
`90`	`90`	`}`
	`91`	`+l.log.Warn(ctx,"connecting to broker failed",slog.Error(err))`
`91`	`92`	`}`
`92`	`93`	`ticker.Stop()`
`93`	`94`	`}`
`94`		`-iferr!=nil {`
`95`		`-l.acceptError=err`
`96`		`-_=l.Close()`
`97`		`-break`
`98`		`-}`
	`95`	`+l.log.Info(ctx,"connected to broker")`
`99`	`96`	`}`
`100`	`97`	`}()`
`101`	`98`	`returnl,nil`
`@@ -106,7 +103,6 @@ type listener struct {`
`106`	`103`	`turnProxyAuthTokenstring`
`107`	`104`
`108`	`105`	`log slog.Logger`
`109`		`-acceptErrorerror`
`110`	`106`	`ws*websocket.Conn`
`111`	`107`	`connClosers []io.Closer`
`112`	`108`	`connClosersMut sync.Mutex`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit3ebd102

File tree

2 files changed

2 files changed

`‎internal/cmd/agent.go`

`‎wsnet/listen.go`

0 commit comments