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

kylecarbs · web-flow · commit 3ebd10262f4e · 2021-08-10T20:12:11.000-05:00
* 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
diff --git a/internal/cmd/agent.go b/internal/cmd/agent.go
@@ -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))
diff --git a/wsnet/listen.go b/wsnet/listen.go
@@ -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
@@ -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
@@ -106,7 +103,6 @@ type listener struct {
 	turnProxyAuthToken string
 
 	log            slog.Logger
-	acceptError    error
 	ws             *websocket.Conn
 	connClosers    []io.Closer
 	connClosersMut sync.Mutex

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`	`return xerrors.Errorf("listen: %w", err)`
`85`	`85`	`}`
`86`	`86`	`defer func() {`
	`87`	`+ log.Info(ctx, "closing wsnet listener")`
`87`	`88`	`err := listener.Close()`
`88`	`89`	`if err != nil {`
`89`	`90`	`log.Error(ctx, "close listener", slog.Error(err))`
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`		`- if errors.Is(err, io.EOF) \|\| errors.Is(err, yamux.ErrKeepAliveTimeout) {`
	`74`	`+ if err != 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`	`if err == 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`		`- if err != 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`	`return l, nil`
`@@ -106,7 +103,6 @@ type listener struct {`
`106`	`103`	`turnProxyAuthToken string`
`107`	`104`
`108`	`105`	`log slog.Logger`
`109`		`- acceptError error`
`110`	`106`	`ws *websocket.Conn`
`111`	`107`	`connClosers []io.Closer`
`112`	`108`	`connClosersMut sync.Mutex`