astra/ntfy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Delete expired attachments based on mod time instead of DB entry to avoid races

Browse source
This commit is contained in:
Philipp Heckel 2022-07-08 10:00:04 -04:00 • committed by Hunter Kehoe
parent f992148d22
commit 916b09e22d
6 changed files with 65 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/server.go
View file

@ -1125,8 +1125,9 @@ func (s *Server) updateStatsAndPrune() {
log.Debug("Manager: Deleted %d stale visitor(s)", staleVisitors)
// Delete expired attachments
if s.fileCache != nil {
ids, err := s.messageCache.AttachmentsExpired()
if s.fileCache != nil && s.config.AttachmentExpiryDuration > 0 {
olderThan := time.Now().Add(-1 * s.config.AttachmentExpiryDuration)
ids, err := s.fileCache.Expired(olderThan)
if err != nil {
log.Warn("Error retrieving expired attachments: %s", err.Error())
} else if len(ids) > 0 {