Skip to content

Commit 6141400

Browse files
Fix: tzkt event close error handling
1 parent a5b8736 commit 6141400

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

tzkt/events/signalr/errors.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ package signalr
33
import "errors"
44

55
var (
6-
ErrUnknownMessageType = errors.New("Unknown message type")
7-
ErrMessageParsing = errors.New("Can't parse message")
8-
ErrEmptyResponse = errors.New("Empty response from server")
9-
ErrHandshake = errors.New("Handshake error")
10-
ErrInvalidStatusCode = errors.New("Invalid status code")
11-
ErrNegotiate = errors.New("Negotiate error")
12-
ErrInvalidScheme = errors.New("Invalid URL scheme. Expected https or http. Got")
13-
ErrConnectionClose = errors.New("Connection is closed")
14-
ErrTimeout = errors.New("Connection timeout")
6+
ErrUnknownMessageType = errors.New("unknown message type")
7+
ErrMessageParsing = errors.New("can't parse message")
8+
ErrEmptyResponse = errors.New("empty response from server")
9+
ErrHandshake = errors.New("handshake error")
10+
ErrInvalidStatusCode = errors.New("invalid status code")
11+
ErrNegotiate = errors.New("negotiate error")
12+
ErrInvalidScheme = errors.New("invalid URL scheme. Expected https or http. Got")
13+
ErrConnectionClose = errors.New("connection is closed")
14+
ErrTimeout = errors.New("connection timeout")
1515
)

tzkt/events/signalr/hub.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func (hub *Hub) listen() {
138138
default:
139139
if err := hub.readAllMessages(); err != nil {
140140
switch {
141-
case errors.Is(err, ErrTimeout):
141+
case errors.Is(err, ErrTimeout) || errors.Is(err, &websocket.CloseError{}):
142142
if err := hub.reconnect(); err != nil {
143143
log.Errorf("reconnect: %s", err.Error())
144144
log.Warn("retry after 5 seconds")
@@ -247,6 +247,7 @@ func (hub *Hub) getScanner() (*JSONReader, error) {
247247
if e, ok := err.(net.Error); ok && e.Timeout() {
248248
return nil, ErrTimeout
249249
}
250+
250251
return nil, errors.Wrap(err, "NextReader")
251252
}
252253
return NewJSONReader(r), nil

0 commit comments

Comments
 (0)