fix: attachment retention

Author: ItsNotGoodName

README.md

@@ -68,12 +68,12 @@ data_directory: smtpbridge_data
 
 # Retention policy for envelopes and attachment files
 retention:
-  # Retention policy for envelopes in database
-  envelope_count: 0 # (100, 250, ...)
-  envelope_age: "" # (5m, 5h45m, ...)
+  # # Retention policy for envelopes in database
+  # envelope_count: # (0, 100, 250, ...) [optional]
+  # envelope_age: # (5m, 5h45m, ...) [optional]
 
-  # Retention policy for attachment files on disk
-  attachment_size: "" # (100 MB, 1 GB, ...)
+  # # Retention policy for attachment files on disk
+  # attachment_size: # (100 MB, 1 GB, ...) [optional]
 
 # HTTP server
 http:

internal/files/files.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path"
 	"sort"
+	"time"
 
 	"github.com/ItsNotGoodName/smtpbridge/internal/core"
 	"github.com/ItsNotGoodName/smtpbridge/internal/envelope"
@@ -47,7 +48,7 @@ func Size(cc *core.Context) (int64, error) {
 	return dirSize, nil
 }
 
-func DeleteFileUntilSize(cc *core.Context, currentSize, maxSize int64) error {
+func DeleteFileUntilSize(cc *core.Context, currentSize, maxSize int64, age time.Time) error {
 	files, err := ioutil.ReadDir(cc.File.Dir)
 	if err != nil {
 		return err
@@ -61,6 +62,9 @@ func DeleteFileUntilSize(cc *core.Context, currentSize, maxSize int64) error {
 		if currentSize < maxSize {
 			break
 		}
+		if files[i].ModTime().After(age) {
+			continue
+		}
 
 		if err := os.Remove(path.Join(cc.File.Dir, files[i].Name())); err != nil {
 			return err

internal/models/retention.go

@@ -1,10 +1,23 @@
 package models
 
-import "time"
+import (
+	"time"
+)
 
 type RetentionPolicy struct {
 	EnvelopeCount  *int
 	EnvelopeAge    *time.Duration
 	MinEnvelopeAge time.Duration
 	AttachmentSize *int64
 }
+
+func (rp RetentionPolicy) EnvelopeAgeDate() time.Time {
+	date := time.Now()
+	if rp.EnvelopeAge != nil && *rp.EnvelopeAge > rp.MinEnvelopeAge {
+		date = date.Add(-*rp.EnvelopeAge)
+	} else {
+		date = date.Add(-rp.MinEnvelopeAge)
+	}
+
+	return date
+}

internal/procs/gardener.go

@@ -2,15 +2,13 @@ package procs
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	"github.com/ItsNotGoodName/smtpbridge/internal/core"
 	"github.com/ItsNotGoodName/smtpbridge/internal/db"
 	"github.com/ItsNotGoodName/smtpbridge/internal/events"
 	"github.com/ItsNotGoodName/smtpbridge/internal/files"
 	"github.com/ItsNotGoodName/smtpbridge/internal/models"
-	"github.com/dustin/go-humanize"
 	"github.com/rs/zerolog/log"
 )
 
@@ -91,30 +89,28 @@ func gardenerDeleteByAttachmentSize(cc *core.Context, policy models.RetentionPol
 	attachmentSize := *policy.AttachmentSize
 
 	if storage.AttachmentSize > attachmentSize {
-		count := humanize.Bytes(uint64(storage.AttachmentSize - attachmentSize))
-		log.Info().Str("count", count).Msg("Deleting attachment files by attachment size retention policy")
-
-		err := files.DeleteFileUntilSize(cc, storage.AttachmentSize, attachmentSize)
+		age := policy.EnvelopeAgeDate()
+		log.Info().Time("age", age).Msg("Deleting attachment files by attachment size retention policy")
+		err := files.DeleteFileUntilSize(cc, storage.AttachmentSize, attachmentSize, age)
 		if err != nil {
 			log.Err(err).Msg("Failed to delete attachment files by attachment size retention policy")
 		}
 	}
 }
 
 func gardenerDeleteByEnvelopeCount(cc *core.Context, policy models.RetentionPolicy, storage models.Storage) {
-	fmt.Println("---------", policy.EnvelopeCount)
 	if policy.EnvelopeCount == nil {
 		return
 	}
 	envelopeCount := *policy.EnvelopeCount
 
 	if storage.EnvelopeCount > envelopeCount {
-		date := time.Now().Add(-policy.MinEnvelopeAge)
-		count, err := db.EnvelopeDeleteUntilCount(cc, envelopeCount, date)
+		age := policy.EnvelopeAgeDate()
+		count, err := db.EnvelopeDeleteUntilCount(cc, envelopeCount, age)
 		if err != nil {
-			log.Err(err).Time("age", date).Int("keep", envelopeCount).Msg("Failed to envelopes by envelope count retention policy")
+			log.Err(err).Time("age", age).Int("keep", envelopeCount).Msg("Failed to envelopes by envelope count retention policy")
 		} else {
-			log.Info().Time("age", date).Int("keep", envelopeCount).Int64("deleted", count).Msg("Deleted envelopes by envelope count retention policy")
+			log.Info().Time("age", age).Int("keep", envelopeCount).Int64("deleted", count).Msg("Deleted envelopes by envelope count retention policy")
 		}
 	}
 }
@@ -123,17 +119,13 @@ func gardenerDeleteByAge(cc *core.Context, policy models.RetentionPolicy) {
 	if policy.EnvelopeAge == nil {
 		return
 	}
-	envelopeAge := *policy.EnvelopeAge
 
-	date := time.Now().Add(-envelopeAge)
-	if policy.MinEnvelopeAge > envelopeAge {
-		date.Add(-policy.MinEnvelopeAge)
-	}
-	count, err := db.EnvelopeDeleteOlderThan(cc, date)
+	age := policy.EnvelopeAgeDate()
+	count, err := db.EnvelopeDeleteOlderThan(cc, age)
 	if err != nil {
-		log.Err(err).Time("age", date).Msg("Failed to delete envelopes by age retention policy")
+		log.Err(err).Time("age", age).Msg("Failed to delete envelopes by age retention policy")
 	} else {
-		log.Info().Time("age", date).Int64("deleted", count).Msg("Deleted envelopes by age retention policy")
+		log.Info().Time("age", age).Int64("deleted", count).Msg("Deleted envelopes by age retention policy")
 	}
 }