fix: fixing data race
This commit is contained in:
@@ -260,18 +260,24 @@ func (wsClient *SafeWebsocketClient) connect() error {
|
|||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
|
|
||||||
|
var c *websocket.Conn
|
||||||
|
wsClient.mu.ReadHandler(func() error {
|
||||||
|
c = conn
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
log.Println("Writer stopped due to client shutdown")
|
log.Println("Writer stopped due to client shutdown")
|
||||||
return
|
return
|
||||||
case data := <-wsClient.writeChan:
|
case data := <-wsClient.writeChan:
|
||||||
if conn == nil {
|
if c == nil {
|
||||||
wsClient.triggerReconnect()
|
wsClient.triggerReconnect()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := conn.WriteMessage(int(data.MessageType), data.Data); err != nil {
|
if err := c.WriteMessage(int(data.MessageType), data.Data); err != nil {
|
||||||
log.Printf("error on write message: %v\n", err)
|
log.Printf("error on write message: %v\n", err)
|
||||||
wsClient.triggerReconnect()
|
wsClient.triggerReconnect()
|
||||||
return
|
return
|
||||||
@@ -287,22 +293,28 @@ func (wsClient *SafeWebsocketClient) connect() error {
|
|||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
|
|
||||||
|
var c *websocket.Conn
|
||||||
|
|
||||||
|
wsClient.mu.ReadHandler(func() error {
|
||||||
|
c = conn
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
if c == nil {
|
||||||
|
wsClient.triggerReconnect()
|
||||||
|
return
|
||||||
|
}
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
log.Println("Reader stopped due to client shutdown")
|
log.Println("Reader stopped due to client shutdown")
|
||||||
return
|
return
|
||||||
default:
|
default:
|
||||||
if conn == nil {
|
if err := c.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
|
||||||
wsClient.triggerReconnect()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := conn.SetReadDeadline(time.Now().Add(readDeadline)); err != nil {
|
|
||||||
log.Printf("error on read deadline: %v\n", err)
|
log.Printf("error on read deadline: %v\n", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
messageType, data, err := conn.ReadMessage()
|
messageType, data, err := c.ReadMessage()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("error on read message: %v\n", err)
|
log.Printf("error on read message: %v\n", err)
|
||||||
wsClient.triggerReconnect()
|
wsClient.triggerReconnect()
|
||||||
|
|||||||
Reference in New Issue
Block a user