aljaz/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli-rest-api.git synced 2025-12-19 23:54:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed deadlock in Websocket write

Browse Source 
* properly unlock mutex to avoid deadlock

see #572
This commit is contained in:
Bernhard B
2024-08-07 17:07:12 +02:00
parent a6624c5dee
commit f3289395ae
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/api.go
View File

@@ -475,14 +475,15 @@ func (a *Api) handleSignalReceive(ws *websocket.Conn, number string, stop chan s
if response.Account == number { if response.Account == number {
a.wsMutex.Lock() a.wsMutex.Lock()
defer a.wsMutex.Unlock()
err = ws.WriteMessage(websocket.TextMessage, []byte(data)) err = ws.WriteMessage(websocket.TextMessage, []byte(data))
if err != nil { if err != nil {
if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) { if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {
log.Error("Couldn't write message: " + err.Error()) log.Error("Couldn't write message: " + err.Error())
} }
a.wsMutex.Unlock()
return return
} }
a.wsMutex.Unlock()
} }
} }
} else { } else {
@@ -493,12 +494,13 @@ func (a *Api) handleSignalReceive(ws *websocket.Conn, number string, stop chan s
return return
} }
a.wsMutex.Lock() a.wsMutex.Lock()
defer a.wsMutex.Unlock()
err = ws.WriteMessage(websocket.TextMessage, errorMsgBytes) err = ws.WriteMessage(websocket.TextMessage, errorMsgBytes)
if err != nil { if err != nil {
log.Error("Couldn't write message: " + err.Error()) log.Error("Couldn't write message: " + err.Error())
a.wsMutex.Unlock()
return return
} }
a.wsMutex.Unlock()
} }
} }
} }