MirrorHub/mautrix-whatsapp
0
0
Fork 1
mirror of https://github.com/tulir/mautrix-whatsapp synced 2024-06-14 17:08:21 +02:00
Code Issues Projects Releases Wiki Activity

Make sure MetricsHandler doesn't crash upon multiple concurrent writes

Browse source 
With heavy traffic, concurrent usage of TrackLoginState() and similar
could result in `fatal error: concurrent map read and map write`,
crashing the whole process.
This commit is contained in:
Tadeusz Sośnierz 2021-10-27 16:48:19 +02:00 committed by Tulir Asokan
parent 923f9c4b21
commit 13cb1e5c5b
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
metrics.go
View file

@ -20,6 +20,7 @@ import (
"context"
"net/http"
"runtime/debug"
"sync"
"time"
"github.com/prometheus/client_golang/prometheus"
@ -58,12 +59,15 @@ type MetricsHandler struct {
unencryptedGroupCount prometheus.Gauge
unencryptedPrivateCount prometheus.Gauge
connected prometheus.Gauge
connectedState map[whatsapp.JID]bool
loggedIn prometheus.Gauge
loggedInState map[whatsapp.JID]bool
syncLocked prometheus.Gauge
syncLockedState map[whatsapp.JID]bool
connected prometheus.Gauge
connectedState map[whatsapp.JID]bool
connectedStateLock sync.Mutex
loggedIn prometheus.Gauge
loggedInState map[whatsapp.JID]bool
loggedInStateLock sync.Mutex
syncLocked prometheus.Gauge
syncLockedState map[whatsapp.JID]bool
syncLockedStateLock sync.Mutex
bufferLength *prometheus.GaugeVec
}
@ -180,6 +184,8 @@ func (mh *MetricsHandler) TrackLoginState(jid whatsapp.JID, loggedIn bool) {
if !mh.running {
return
}
mh.loggedInStateLock.Lock()
defer mh.loggedInStateLock.Unlock()
currentVal, ok := mh.loggedInState[jid]
if !ok || currentVal != loggedIn {
mh.loggedInState[jid] = loggedIn
@ -195,6 +201,9 @@ func (mh *MetricsHandler) TrackConnectionState(jid whatsapp.JID, connected bool)
if !mh.running {
return
}
mh.connectedStateLock.Lock()
defer mh.connectedStateLock.Unlock()
currentVal, ok := mh.connectedState[jid]
if !ok || currentVal != connected {
mh.connectedState[jid] = connected
@ -210,6 +219,8 @@ func (mh *MetricsHandler) TrackSyncLock(jid whatsapp.JID, locked bool) {
if !mh.running {
return
}
mh.syncLockedStateLock.Lock()
defer mh.syncLockedStateLock.Unlock()
currentVal, ok := mh.syncLockedState[jid]
if !ok || currentVal != locked {
mh.syncLockedState[jid] = locked