neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing some race condition issues

This commit is contained in:
John Donaldson 2022-05-17 13:30:33 -07:00
parent ac00872433
commit 72d5a79798
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/mothd/state_filesystem.go
View File

@ -420,6 +420,8 @@ func (s *State) awardPointsAtTime(when int64, teamID string, category string, po
} }
func (s *State) PointExists(teamID string, cat string, points int) bool { func (s *State) PointExists(teamID string, cat string, points int) bool {
s.pointsLock.RLock()
defer s.pointsLock.RUnlock()
for _, pointEntry := range s.pointsLog { for _, pointEntry := range s.pointsLog {
if (pointEntry.TeamID == teamID) && (pointEntry.Category == cat) && (pointEntry.Points == points) { if (pointEntry.TeamID == teamID) && (pointEntry.Category == cat) && (pointEntry.Points == points) {
return true return true
@ -430,6 +432,9 @@ func (s *State) PointExists(teamID string, cat string, points int) bool {
} }
func (s *State) PointExistsAtTime(teamID string, cat string, points int, when int64) bool { func (s *State) PointExistsAtTime(teamID string, cat string, points int, when int64) bool {
s.pointsLock.RLock()
defer s.pointsLock.RUnlock()
for _, pointEntry := range s.pointsLog { for _, pointEntry := range s.pointsLog {
if (pointEntry.TeamID == teamID) && (pointEntry.Category == cat) && (pointEntry.Points == points) && (pointEntry.When == when) { if (pointEntry.TeamID == teamID) && (pointEntry.Category == cat) && (pointEntry.Points == points) && (pointEntry.When == when) {
return true return true
@ -745,8 +750,7 @@ func (s *State) reopenEventLog() error {
} }
func (s *State) updateCaches() { func (s *State) updateCaches() {
s.pointsLock.RLock()
defer s.pointsLock.RUnlock()
// Re-read the points log // Re-read the points log
{ {
@ -769,8 +773,9 @@ func (s *State) updateCaches() {
} }
pointsLog = append(pointsLog, cur) pointsLog = append(pointsLog, cur)
} }
s.pointsLock.Lock()
s.pointsLog = pointsLog s.pointsLog = pointsLog
s.pointsLock.Unlock()
} }
} }