d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-05-13 23:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

websocket: Relay disconnect errors to subscribers (#1347)

Browse Source 
* WS: Relay disconnect errors to subscribers

Subscribers probably care when the WS got disconncted.
Tell them and expose a method to test the error for matching

* Fix linter error
This commit is contained in:
Gareth Kirwan
2023-09-14 01:14:04 +01:00
committed by GitHub
parent bcabf44b8c
commit c8ec22fe92
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
exchanges/stream/websocket.go
View File

@@ -391,16 +391,15 @@ func (w *Websocket) connectionMonitor() error {
}
select {
case err := <-w.ReadMessageErrors:
if isDisconnectionError(err) {
if IsDisconnectionError(err) {
w.setInit(false)
log.Warnf(log.WebsocketMgr,
"%v websocket has been disconnected. Reason: %v",
w.exchangeName, err)
w.setConnectedStatus(false)
} else {
// pass off non disconnect errors to datahandler to manage
w.DataHandler <- err
}
w.DataHandler <- err
case <-timer.C:
if !w.IsConnecting() && !w.IsConnected() {
err := w.Connect()
@@ -983,8 +982,8 @@ func (w *Websocket) CanUseAuthenticatedEndpoints() bool {
return w.canUseAuthenticatedEndpoints
}
// isDisconnectionError Determines if the error sent over chan ReadMessageErrors is a disconnection error
func isDisconnectionError(err error) bool {
// IsDisconnectionError Determines if the error sent over chan ReadMessageErrors is a disconnection error
func IsDisconnectionError(err error) bool {
if websocket.IsUnexpectedCloseError(err) {
return true
}

2
exchanges/stream/websocket_connection.go
View File

@@ -216,7 +216,7 @@ func (w *WebsocketConnection) IsConnected() bool {
func (w *WebsocketConnection) ReadMessage() Response {
mType, resp, err := w.Connection.ReadMessage()
if err != nil {
if isDisconnectionError(err) {
if IsDisconnectionError(err) {
if w.setConnectedStatus(false) {
// NOTE: When w.setConnectedStatus() returns true the underlying
// state was changed and this infers that the connection was

14
exchanges/stream/websocket_test.go
View File

@@ -230,11 +230,11 @@ func TestTrafficMonitorTimeout(t *testing.T) {
func TestIsDisconnectionError(t *testing.T) {
t.Parallel()
isADisconnectionError := isDisconnectionError(errors.New("errorText"))
isADisconnectionError := IsDisconnectionError(errors.New("errorText"))
if isADisconnectionError {
t.Error("Its not")
}
isADisconnectionError = isDisconnectionError(&websocket.CloseError{
isADisconnectionError = IsDisconnectionError(&websocket.CloseError{
Code: 1006,
Text: "errorText",
})
@@ -242,14 +242,14 @@ func TestIsDisconnectionError(t *testing.T) {
t.Error("It is")
}
isADisconnectionError = isDisconnectionError(&net.OpError{
isADisconnectionError = IsDisconnectionError(&net.OpError{
Err: errClosedConnection,
})
if isADisconnectionError {
t.Error("It's not")
}
isADisconnectionError = isDisconnectionError(&net.OpError{
isADisconnectionError = IsDisconnectionError(&net.OpError{
Err: errors.New("errText"),
})
if !isADisconnectionError {
@@ -321,8 +321,10 @@ func TestConnectionMessageErrors(t *testing.T) {
outer:
for {
select {
case <-ws.ToRoutine:
t.Fatal("Error is a disconnection error")
case err := <-ws.ToRoutine:
if _, ok := err.(*websocket.CloseError); !ok {
t.Errorf("Error is not a disconnection error: %v", err)
}
case <-timer.C:
break outer
}