deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-05-12 18:46:33 +02:00
Code Issues Releases Wiki Activity

Fix deadlock if virtual session leaves room.

Browse source
This commit is contained in:
Joachim Bauch 2022-07-12 10:09:22 +02:00
parent 5fc61b15b6
commit d1c5d785c8
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
room.go
View file

@ -452,8 +452,6 @@ func (r *Room) RemoveSession(session Session) bool {
return true return true
} }
// Still need to publish an event so sessions on other servers get notified.
r.PublishSessionLeft(session)
r.hub.removeRoom(r) r.hub.removeRoom(r)
r.statsRoomSessionsCurrent.Delete(prometheus.Labels{"clienttype": HelloClientTypeClient}) r.statsRoomSessionsCurrent.Delete(prometheus.Labels{"clienttype": HelloClientTypeClient})
r.statsRoomSessionsCurrent.Delete(prometheus.Labels{"clienttype": HelloClientTypeInternal}) r.statsRoomSessionsCurrent.Delete(prometheus.Labels{"clienttype": HelloClientTypeInternal})
@ -461,6 +459,8 @@ func (r *Room) RemoveSession(session Session) bool {
r.unsubscribeBackend() r.unsubscribeBackend()
r.doClose() r.doClose()
r.mu.Unlock() r.mu.Unlock()
// Still need to publish an event so sessions on other servers get notified.
r.PublishSessionLeft(session)
return false return false
} }
@ -564,6 +564,7 @@ func (r *Room) PublishSessionLeft(session Session) {
func (r *Room) addInternalSessions(users []map[string]interface{}) []map[string]interface{} { func (r *Room) addInternalSessions(users []map[string]interface{}) []map[string]interface{} {
now := time.Now().Unix() now := time.Now().Unix()
r.mu.Lock() r.mu.Lock()
defer r.mu.Unlock()
for _, user := range users { for _, user := range users {
sessionid, found := user["sessionId"] sessionid, found := user["sessionId"]
if !found || sessionid == "" { if !found || sessionid == "" {
@ -592,7 +593,6 @@ func (r *Room) addInternalSessions(users []map[string]interface{}) []map[string]
"virtual": true, "virtual": true,
}) })
} }
r.mu.Unlock()
return users return users
} }