Aug 11, 2021 · Aug 11, 2021 · Aug 11, 2021 · Aug 11, 2021 · Aug 11, 2021 · Aug 11, 2021
diff --git a/internal/cmd/agent.go b/internal/cmd/agent.go
 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
 default:
 }

 iferrors.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
 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
 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
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
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:
		}

		iferrors.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