deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-06-12 02:42:16 +02:00
Code Issues Releases Wiki Activity

Merge pull request #735 from strukturag/read-error-after-close

Browse source 
Don't log read error after we closed the connection.
This commit is contained in:
Joachim Bauch 2024-05-16 09:36:07 +02:00 committed by GitHub
parent 552474f6f0 3e92664edc
commit 3fc5f5253d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
client.go
View file

@ -24,7 +24,9 @@ package signaling
import (
"bytes"
"encoding/json"
"errors"
"log"
"net"
"strconv"
"strings"
"sync"
@ -354,7 +356,10 @@ func (c *Client) ReadPump() {
conn.SetReadDeadline(time.Now().Add(pongWait)) // nolint
messageType, reader, err := conn.NextReader()
if err != nil {
if _, ok := err.(*websocket.CloseError); !ok || websocket.IsUnexpectedCloseError(err,
// Gorilla websocket hides the original net.Error, so also compare error messages
if errors.Is(err, net.ErrClosed) || strings.Contains(err.Error(), net.ErrClosed.Error()) {
break
} else if _, ok := err.(*websocket.CloseError); !ok || websocket.IsUnexpectedCloseError(err,
websocket.CloseNormalClosure,
websocket.CloseGoingAway,
websocket.CloseNoStatusReceived) {