feat(preview): TTL ticker with CleanupExpired and teardown callback
- commit
- 4bf8eb7b3c5b7cd881a762cf4f75b9ba85e8830a
- author
- brice · · 2026-03-19 04:59 UTC
- committer
- brice · · 2026-03-19 05:13 UTC
- parent
- 2a244b6
- signature
- unsigned
2 files · +75 -0
M internal/usecase/auto/preview/service.go +44 -0
| @@ -110,6 +110,50 @@ func (s *Service) GetExpired() []domain.PreviewRoute { | |||
| 110 | 110 | return expired | |
| 111 | 111 | } | |
| 112 | 112 | ||
| 113 | + | // CleanupExpired removes expired previews from the service and persists. | |
| 114 | + | // Returns the removed previews so the caller can teardown their resources. | |
| 115 | + | func (s *Service) CleanupExpired(ctx context.Context) []domain.PreviewRoute { | |
| 116 | + | s.mu.Lock() | |
| 117 | + | var expired []domain.PreviewRoute | |
| 118 | + | var active []domain.PreviewRoute | |
| 119 | + | for _, p := range s.previews { | |
| 120 | + | if p.IsExpired() { | |
| 121 | + | expired = append(expired, p) | |
| 122 | + | } else { | |
| 123 | + | active = append(active, p) | |
| 124 | + | } | |
| 125 | + | } | |
| 126 | + | s.previews = active | |
| 127 | + | cp := make([]domain.PreviewRoute, len(active)) | |
| 128 | + | copy(cp, active) | |
| 129 | + | s.mu.Unlock() | |
| 130 | + | ||
| 131 | + | if len(expired) > 0 { | |
| 132 | + | _ = s.store.Save(ctx, cp) | |
| 133 | + | } | |
| 134 | + | return expired | |
| 135 | + | } | |
| 136 | + | ||
| 137 | + | // StartTicker starts a background goroutine that checks for expired previews. | |
| 138 | + | // The teardownFn is called for each expired preview to clean up containers/volumes. | |
| 139 | + | func (s *Service) StartTicker(ctx context.Context, interval time.Duration, teardownFn func(context.Context, domain.PreviewRoute)) { | |
| 140 | + | go func() { | |
| 141 | + | ticker := time.NewTicker(interval) | |
| 142 | + | defer ticker.Stop() | |
| 143 | + | for { | |
| 144 | + | select { | |
| 145 | + | case <-ctx.Done(): | |
| 146 | + | return | |
| 147 | + | case <-ticker.C: | |
| 148 | + | expired := s.CleanupExpired(ctx) | |
| 149 | + | for _, p := range expired { | |
| 150 | + | teardownFn(ctx, p) | |
| 151 | + | } | |
| 152 | + | } | |
| 153 | + | } | |
| 154 | + | }() | |
| 155 | + | } | |
| 156 | + | ||
| 113 | 157 | func (s *Service) AcquireNameLock(name string) *sync.Mutex { | |
| 114 | 158 | s.nameLockMu.Lock() | |
| 115 | 159 | defer s.nameLockMu.Unlock() | |
| @@ -110,6 +110,50 @@ func (s *Service) GetExpired() []domain.PreviewRoute { | |||||
| 110 | return expired | 110 | return expired | ||
| 111 | } | 111 | } | ||
| 112 | 112 | ||||
| 113 | + | // CleanupExpired removes expired previews from the service and persists. | |||
| 114 | + | // Returns the removed previews so the caller can teardown their resources. | |||
| 115 | + | func (s *Service) CleanupExpired(ctx context.Context) []domain.PreviewRoute { | |||
| 116 | + | s.mu.Lock() | |||
| 117 | + | var expired []domain.PreviewRoute | |||
| 118 | + | var active []domain.PreviewRoute | |||
| 119 | + | for _, p := range s.previews { | |||
| 120 | + | if p.IsExpired() { | |||
| 121 | + | expired = append(expired, p) | |||
| 122 | + | } else { | |||
| 123 | + | active = append(active, p) | |||
| 124 | + | } | |||
| 125 | + | } | |||
| 126 | + | s.previews = active | |||
| 127 | + | cp := make([]domain.PreviewRoute, len(active)) | |||
| 128 | + | copy(cp, active) | |||
| 129 | + | s.mu.Unlock() | |||
| 130 | + | ||||
| 131 | + | if len(expired) > 0 { | |||
| 132 | + | _ = s.store.Save(ctx, cp) | |||
| 133 | + | } | |||
| 134 | + | return expired | |||
| 135 | + | } | |||
| 136 | + | ||||
| 137 | + | // StartTicker starts a background goroutine that checks for expired previews. | |||
| 138 | + | // The teardownFn is called for each expired preview to clean up containers/volumes. | |||
| 139 | + | func (s *Service) StartTicker(ctx context.Context, interval time.Duration, teardownFn func(context.Context, domain.PreviewRoute)) { | |||
| 140 | + | go func() { | |||
| 141 | + | ticker := time.NewTicker(interval) | |||
| 142 | + | defer ticker.Stop() | |||
| 143 | + | for { | |||
| 144 | + | select { | |||
| 145 | + | case <-ctx.Done(): | |||
| 146 | + | return | |||
| 147 | + | case <-ticker.C: | |||
| 148 | + | expired := s.CleanupExpired(ctx) | |||
| 149 | + | for _, p := range expired { | |||
| 150 | + | teardownFn(ctx, p) | |||
| 151 | + | } | |||
| 152 | + | } | |||
| 153 | + | } | |||
| 154 | + | }() | |||
| 155 | + | } | |||
| 156 | + | ||||
| 113 | func (s *Service) AcquireNameLock(name string) *sync.Mutex { | 157 | func (s *Service) AcquireNameLock(name string) *sync.Mutex { | ||
| 114 | s.nameLockMu.Lock() | 158 | s.nameLockMu.Lock() | ||
| 115 | defer s.nameLockMu.Unlock() | 159 | defer s.nameLockMu.Unlock() | ||
A internal/usecase/auto/preview/ticker_test.go +31 -0
| @@ -0,0 +1,31 @@ | |||
| 1 | + | package preview | |
| 2 | + | ||
| 3 | + | import ( | |
| 4 | + | "context" | |
| 5 | + | "testing" | |
| 6 | + | "time" | |
| 7 | + | ||
| 8 | + | "github.com/bnema/gordon/internal/domain" | |
| 9 | + | "github.com/stretchr/testify/assert" | |
| 10 | + | "github.com/stretchr/testify/require" | |
| 11 | + | ) | |
| 12 | + | ||
| 13 | + | func TestPreviewService_CleanupExpired(t *testing.T) { | |
| 14 | + | store := &fakeStore{ | |
| 15 | + | previews: []domain.PreviewRoute{ | |
| 16 | + | {Name: "expired", Domain: "a--expired.example.com", ExpiresAt: time.Now().Add(-1 * time.Hour)}, | |
| 17 | + | {Name: "active", Domain: "a--active.example.com", ExpiresAt: time.Now().Add(24 * time.Hour)}, | |
| 18 | + | }, | |
| 19 | + | } | |
| 20 | + | svc := NewService(store, 48*time.Hour) | |
| 21 | + | require.NoError(t, svc.Load(context.Background())) | |
| 22 | + | ||
| 23 | + | expired := svc.CleanupExpired(context.Background()) | |
| 24 | + | assert.Len(t, expired, 1) | |
| 25 | + | assert.Equal(t, "expired", expired[0].Name) | |
| 26 | + | ||
| 27 | + | all, err := svc.List(context.Background()) | |
| 28 | + | require.NoError(t, err) | |
| 29 | + | assert.Len(t, all, 1) | |
| 30 | + | assert.Equal(t, "active", all[0].Name) | |
| 31 | + | } | |
| @@ -0,0 +1,31 @@ | |||||
| 1 | + | package preview | |||
| 2 | + | ||||
| 3 | + | import ( | |||
| 4 | + | "context" | |||
| 5 | + | "testing" | |||
| 6 | + | "time" | |||
| 7 | + | ||||
| 8 | + | "github.com/bnema/gordon/internal/domain" | |||
| 9 | + | "github.com/stretchr/testify/assert" | |||
| 10 | + | "github.com/stretchr/testify/require" | |||
| 11 | + | ) | |||
| 12 | + | ||||
| 13 | + | func TestPreviewService_CleanupExpired(t *testing.T) { | |||
| 14 | + | store := &fakeStore{ | |||
| 15 | + | previews: []domain.PreviewRoute{ | |||
| 16 | + | {Name: "expired", Domain: "a--expired.example.com", ExpiresAt: time.Now().Add(-1 * time.Hour)}, | |||
| 17 | + | {Name: "active", Domain: "a--active.example.com", ExpiresAt: time.Now().Add(24 * time.Hour)}, | |||
| 18 | + | }, | |||
| 19 | + | } | |||
| 20 | + | svc := NewService(store, 48*time.Hour) | |||
| 21 | + | require.NoError(t, svc.Load(context.Background())) | |||
| 22 | + | ||||
| 23 | + | expired := svc.CleanupExpired(context.Background()) | |||
| 24 | + | assert.Len(t, expired, 1) | |||
| 25 | + | assert.Equal(t, "expired", expired[0].Name) | |||
| 26 | + | ||||
| 27 | + | all, err := svc.List(context.Background()) | |||
| 28 | + | require.NoError(t, err) | |||
| 29 | + | assert.Len(t, all, 1) | |||
| 30 | + | assert.Equal(t, "active", all[0].Name) | |||
| 31 | + | } | |||