johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Serialize websocket writes with a mutex (#256)

Browse Source 
Fixes #241

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
This commit is contained in:
ifedorenko
2020-02-20 19:58:40 -05:00
committed by GitHub
parent 55693fab35
commit d43255885c
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/api/websocket.go
View File

@@ -33,7 +33,7 @@ var wsAuth = struct {
mutex sync.RWMutex
}{authenticated: make(map[string]bool)}
func wsReader(ws *websocket.Conn, connId string, conf *config.Config) {
func wsReader(ws *websocket.Conn, writeMutex *sync.Mutex, connId string, conf *config.Config) {
defer ws.Close()
ws.SetReadLimit(512)
@@ -61,17 +61,19 @@ func wsReader(ws *websocket.Conn, connId string, conf *config.Config) {
wsAuth.authenticated[connId] = true
wsAuth.mutex.Unlock()
writeMutex.Lock()
ws.SetWriteDeadline(time.Now().Add(30 * time.Second))
if err := ws.WriteJSON(gin.H{"event": "config.updated", "data": event.Data(conf.ClientConfig())}); err != nil {
log.Error(err)
}
writeMutex.Unlock()
}
}
}
}
func wsWriter(ws *websocket.Conn, connId string) {
func wsWriter(ws *websocket.Conn, writeMutex *sync.Mutex, connId string) {
pingTicker := time.NewTicker(15 * time.Second)
s := event.Subscribe("log.*", "notify.*", "index.*", "upload.*", "import.*", "config.*", "count.*", "photos.*", "albums.*", "labels.*")
@@ -98,12 +100,15 @@ func wsWriter(ws *websocket.Conn, connId string) {
wsAuth.mutex.RUnlock()
if auth {
writeMutex.Lock()
ws.SetWriteDeadline(time.Now().Add(30 * time.Second))
if err := ws.WriteJSON(gin.H{"event": msg.Name, "data": msg.Fields}); err != nil {
writeMutex.Unlock()
log.Debug(err)
return
}
writeMutex.Unlock()
}
}
}
@@ -131,6 +136,8 @@ func Websocket(router *gin.RouterGroup, conf *config.Config) {
return
}
var writeMutex sync.Mutex
defer ws.Close()
connId := rnd.UUID()
@@ -143,8 +150,8 @@ func Websocket(router *gin.RouterGroup, conf *config.Config) {
log.Debug("websocket: connected")
go wsWriter(ws, connId)
go wsWriter(ws, &writeMutex, connId)
wsReader(ws, connId, conf)
wsReader(ws, &writeMutex, connId, conf)
})
}