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

Fixing some locking issues

This commit is contained in:
John Donaldson 2022-05-17 13:14:09 -07:00
parent 9793de315a
commit 9a8ec19908
1 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
cmd/mothd/state_filesystem.go
View File

@ -283,7 +283,6 @@ func (s *State) SetTeamName(teamID, teamName string) error {
return fmt.Errorf("team ID not found in list of valid team IDs") return fmt.Errorf("team ID not found in list of valid team IDs")
} }
s.teamNameLock.RLock() s.teamNameLock.RLock()
_, ok := s.teamNames[teamID] _, ok := s.teamNames[teamID]
s.teamNameLock.RUnlock() s.teamNameLock.RUnlock()
@ -452,7 +451,7 @@ func (s *State) flushPointsLog(newPoints award.List) error {
defer logf.Close() defer logf.Close()
if err != nil { if err != nil {
return fmt.Errorf("Can't write to points log: ", err) return fmt.Errorf("Can't write to points log: %s", err)
} }
for _, pointEntry := range newPoints { for _, pointEntry := range newPoints {
fmt.Fprintln(logf, pointEntry.String()) fmt.Fprintln(logf, pointEntry.String())
@ -569,21 +568,24 @@ func (s *State) collectPoints() {
} else { } else {
log.Print("Award: ", awd.String()) log.Print("Award: ", awd.String())
s.pointsLogFileLock.Lock() {
defer s.pointsLogFileLock.Unlock() s.pointsLogFileLock.Lock()
logf, err := s.OpenFile("points.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) logf, err := s.OpenFile("points.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
if err != nil { if err != nil {
log.Print("Can't append to points log: ", err) log.Print("Can't append to points log: ", err)
return s.pointsLogFileLock.Unlock()
return
}
fmt.Fprintln(logf, awd.String())
logf.Close()
s.pointsLogFileLock.Unlock()
} }
fmt.Fprintln(logf, awd.String())
logf.Close()
// Stick this on the cache too // Stick this on the cache too
s.pointsLock.Lock() s.pointsLock.Lock()
defer s.pointsLock.Unlock()
s.pointsLog = append(s.pointsLog, awd) s.pointsLog = append(s.pointsLog, awd)
s.pointsLock.Unlock()
} }
if err := s.Remove(filename); err != nil { if err := s.Remove(filename); err != nil {
@ -746,28 +748,30 @@ func (s *State) updateCaches() {
s.pointsLock.RLock() s.pointsLock.RLock()
defer s.pointsLock.RUnlock() defer s.pointsLock.RUnlock()
s.pointsLogFileLock.RLock() // Re-read the points log
defer s.pointsLogFileLock.RUnlock() {
s.pointsLogFileLock.RLock()
defer s.pointsLogFileLock.RUnlock()
if f, err := s.Open("points.log"); err != nil { if f, err := s.Open("points.log"); err != nil {
log.Println(err) log.Println(err)
} else { } else {
defer f.Close() defer f.Close()
pointsLog := make(award.List, 0, 200) pointsLog := make(award.List, 0, 200)
scanner := bufio.NewScanner(f) scanner := bufio.NewScanner(f)
for scanner.Scan() { for scanner.Scan() {
line := scanner.Text() line := scanner.Text()
cur, err := award.Parse(line) cur, err := award.Parse(line)
if err != nil { if err != nil {
log.Printf("Skipping malformed award line %s: %s", line, err) log.Printf("Skipping malformed award line %s: %s", line, err)
continue continue
}
pointsLog = append(pointsLog, cur)
} }
pointsLog = append(pointsLog, cur)
}
s.pointsLog = pointsLog s.pointsLog = pointsLog
}
} }
// Only do this if the teams directory has a newer mtime; directories with // Only do this if the teams directory has a newer mtime; directories with
@ -806,11 +810,14 @@ func (s *State) updateCaches() {
} }
} }
s.messageFileLock.RLock() // Re-read the messages file
defer s.messageFileLock.RUnlock() {
s.messageFileLock.RLock()
defer s.messageFileLock.RUnlock()
if bMessages, err := afero.ReadFile(s, "messages.html"); err == nil { if bMessages, err := afero.ReadFile(s, "messages.html"); err == nil {
s.messages = string(bMessages) s.messages = string(bMessages)
}
} }
} }