From 30a736c49e9b088820f13b7ee7ac446ec2a32ac5 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Fri, 6 Mar 2026 09:37:55 -0800 Subject: [PATCH] fix: resolve bugs in pubsub and codersdk chat packages (#22717) --- coderd/pubsub/chatevent.go | 2 +- codersdk/chats.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coderd/pubsub/chatevent.go b/coderd/pubsub/chatevent.go index 83e49fa64e..bdadf01055 100644 --- a/coderd/pubsub/chatevent.go +++ b/coderd/pubsub/chatevent.go @@ -23,7 +23,7 @@ func HandleChatEvent(cb func(ctx context.Context, payload ChatEvent, err error)) } var payload ChatEvent if err := json.Unmarshal(message, &payload); err != nil { - cb(ctx, ChatEvent{}, xerrors.Errorf("unmarshal chat event")) + cb(ctx, ChatEvent{}, xerrors.Errorf("unmarshal chat event: %w", err)) return } diff --git a/codersdk/chats.go b/codersdk/chats.go index bbcf48d94d..8175ae5bc7 100644 --- a/codersdk/chats.go +++ b/codersdk/chats.go @@ -802,7 +802,7 @@ func (c *Client) StreamChat(ctx context.Context, chatID uuid.UUID, opts *StreamC return events, closeFunc(func() error { streamCancel() - return conn.Close(websocket.StatusNormalClosure, "") + return nil }), nil }