Skip to content
This repository has been archived by the owner on Jul 11, 2024. It is now read-only.

Fix error returned when closing VoiceClient #301

Merged
merged 1 commit into from
May 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion internal/gateway/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,9 @@ func (c *client) receiver(ctx context.Context) {
var packet []byte
var err error
if packet, err = c.conn.Read(ctx); err != nil {
c.log.Debug(c.getLogPrefix(), "read error: ", err.Error())
if !errors.Is(err, context.Canceled) && ctx.Err() != nil {
c.log.Debug(c.getLogPrefix(), "read error: ", err.Error())
}
reconnect := true
var closeErr *CloseErr
isCloseErr := errors.As(err, &closeErr)
Expand Down
6 changes: 6 additions & 0 deletions internal/gateway/websocket_nhooyr.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ func (g *nhooyr) Read(ctx context.Context) (packet []byte, err error) {
var messageType websocket.MessageType
messageType, packet, err = g.c.Read(ctx)
if err != nil {
// Cancelling Read by ctx results in closed WS, see issue
// https://github.com/nhooyr/websocket/issues/242
if ctx.Err() != nil && errors.Is(err, context.Canceled) {
g.isConnected.Store(false)
return nil, context.Canceled
}
var closeErr websocket.CloseError
if errors.As(err, &closeErr) {
g.isConnected.Store(false)
Expand Down