fixed deadlock in Websocket write

* properly unlock mutex to avoid deadlock see #572
bbernhard · Aug 7, 2024 · f328939 · f328939
1 parent a6624c5
commit f328939
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/api/api.go b/src/api/api.go
@@ -475,14 +475,15 @@ func (a *Api) handleSignalReceive(ws *websocket.Conn, number string, stop chan s
 
 					if response.Account == number {
 						a.wsMutex.Lock()
-						defer a.wsMutex.Unlock()
 						err = ws.WriteMessage(websocket.TextMessage, []byte(data))
 						if err != nil {
 							if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {
 								log.Error("Couldn't write message: " + err.Error())
 							}
+							a.wsMutex.Unlock()
 							return
 						}
+						a.wsMutex.Unlock()
 					}
 				}
 			} else {
@@ -493,12 +494,13 @@ func (a *Api) handleSignalReceive(ws *websocket.Conn, number string, stop chan s
 					return
 				}
 				a.wsMutex.Lock()
-				defer a.wsMutex.Unlock()
 				err = ws.WriteMessage(websocket.TextMessage, errorMsgBytes)
 				if err != nil {
 					log.Error("Couldn't write message: " + err.Error())
+					a.wsMutex.Unlock()
 					return
 				}
+				a.wsMutex.Unlock()
 			}
 		}
 	}