Skip to content

Modern Docker Management, Designed for Everyone

fix(scheduler): reset invalid cron settings to defaults at startup (#4425)

Kyle Mendell6d965f1e5098
diff --git a/backend/internal/environment/service.go b/backend/internal/environment/service.go
index 5b419e57a..68be261f5 100644
--- a/backend/internal/environment/service.go
+++ b/backend/internal/environment/service.go
@@ -51,6 +51,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/entityjobs"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/jobcontext"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/runs"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/tracing"
@@ -989,8 +990,7 @@ func (s *EnvironmentService) SetScheduler(ctx context.Context, jobScheduler sche
func (s *EnvironmentService) registerHealthJob(ctx context.Context, envID string) {
s.jobs.Register(ctx, envID,
func(ctx context.Context) string {
- sched := s.settingsService.GetStringSetting(ctx, "environmentHealthInterval", defaultEnvironmentHealthInterval)
- return kit.Ternary(sched == "", defaultEnvironmentHealthInterval, sched)
+ return schedule.Or(ctx, s.settingsService.GetStringSetting(ctx, "environmentHealthInterval", defaultEnvironmentHealthInterval), defaultEnvironmentHealthInterval, environmentHealthJobPrefix+envID)
},
func(ctx context.Context) (scheduler.Outcome, error) { return s.runHealthCheck(ctx, envID) },
func(context.Context, scheduler.Run) (scheduler.Outcome, error) {
diff --git a/backend/internal/settings/service.go b/backend/internal/settings/service.go
index c8a0fb9d8..d450f4a2f 100644
--- a/backend/internal/settings/service.go
+++ b/backend/internal/settings/service.go
@@ -37,6 +37,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/search"
"github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane"
"github.com/getarcaneapp/arcane/backend/v2/pkg/projects"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/concurrency"
"github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"
@@ -688,11 +689,16 @@ func (s *SettingsService) EnsureDefaultSettings(ctx context.Context) error {
}
case err != nil:
return fmt.Errorf("failed to check for existing setting %s: %w", defaultSetting.Key, err)
- case slices.Contains(retiredSettingValues[defaultSetting.Key], existing.Value):
+ case slices.Contains(retiredSettingValues[defaultSetting.Key], existing.Value),
+ existing.Value != "" && s.GetSettingType(defaultSetting.Key) == "cron" && func() bool {
+ _, parseErr := schedule.Parser().Parse(existing.Value)
+ return parseErr != nil
+ }():
replaceDefaultSettingErr := tx.Model(&SettingVariable{}).Where("key = ?", defaultSetting.Key).Update("value", defaultSetting.Value).Error
if replaceDefaultSettingErr != nil {
- return fmt.Errorf("failed to replace retired default for setting %s: %w", defaultSetting.Key, replaceDefaultSettingErr)
+ return fmt.Errorf("failed to replace setting %s with default: %w", defaultSetting.Key, replaceDefaultSettingErr)
}
+ slog.InfoContext(ctx, "Replaced invalid setting value with default", "key", defaultSetting.Key, "from", existing.Value, "to", defaultSetting.Value)
}
}
return nil
diff --git a/backend/pkg/scheduler/auto_update_job.go b/backend/pkg/scheduler/auto_update_job.go
index 732a104fc..136698da9 100644
--- a/backend/pkg/scheduler/auto_update_job.go
+++ b/backend/pkg/scheduler/auto_update_job.go
@@ -3,11 +3,10 @@ package scheduler
import (
"context"
- kit "go.getarcane.app/kit/pkg"
-
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
"github.com/getarcaneapp/arcane/backend/v2/internal/updater"
"github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/flow"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
)
const autoUpdateDefaultSchedule = "0 0 0 * * *"
@@ -20,8 +19,7 @@ func NewAutoUpdateJob(engine *flow.Engine, updaterService *updater.UpdaterServic
Workflow: updaterService.AutoUpdateWorkflow(),
JobName: "auto-update",
ScheduleFn: func(ctx context.Context) string {
- schedule := settingsService.GetStringSetting(ctx, "autoUpdateInterval", autoUpdateDefaultSchedule)
- return kit.Ternary(schedule == "", autoUpdateDefaultSchedule, schedule)
+ return schedule.Or(ctx, settingsService.GetStringSetting(ctx, "autoUpdateInterval", autoUpdateDefaultSchedule), autoUpdateDefaultSchedule, "auto-update")
},
ShouldRunFn: func(ctx context.Context) bool {
return settingsService.GetBoolSetting(ctx, "autoUpdate", false) && settingsService.GetBoolSetting(ctx, "pollingEnabled", true)
diff --git a/backend/pkg/scheduler/event_cleanup_job.go b/backend/pkg/scheduler/event_cleanup_job.go
index 578ae424d..c46dbc03d 100644
--- a/backend/pkg/scheduler/event_cleanup_job.go
+++ b/backend/pkg/scheduler/event_cleanup_job.go
@@ -6,11 +6,11 @@ import (
"time"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- kit "go.getarcane.app/kit/pkg"
"github.com/getarcaneapp/arcane/backend/v2/internal/activity"
"github.com/getarcaneapp/arcane/backend/v2/internal/event"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
)
const EventCleanupJobName = "event-cleanup"
@@ -34,8 +34,7 @@ func (j *EventCleanupJob) Name() string {
}
func (j *EventCleanupJob) Schedule(ctx context.Context) string {
- s := j.settingsService.GetStringSetting(ctx, "eventCleanupInterval", "0 0 */6 * * *")
- return kit.Ternary(s == "", "0 0 */6 * * *", s)
+ return schedule.Or(ctx, j.settingsService.GetStringSetting(ctx, "eventCleanupInterval", "0 0 */6 * * *"), "0 0 */6 * * *", EventCleanupJobName)
}
func (j *EventCleanupJob) Run(ctx context.Context) (schedulertypes.Outcome, error) {
diff --git a/backend/pkg/scheduler/expired_sessions_cleanup_job.go b/backend/pkg/scheduler/expired_sessions_cleanup_job.go
index 9464e9c54..aef03e9ec 100644
--- a/backend/pkg/scheduler/expired_sessions_cleanup_job.go
+++ b/backend/pkg/scheduler/expired_sessions_cleanup_job.go
@@ -6,10 +6,10 @@ import (
"time"
schedulertypes "github.com/getarcaneapp/arcane/types/v2/scheduler"
- kit "go.getarcane.app/kit/pkg"
"github.com/getarcaneapp/arcane/backend/v2/internal/session"
"github.com/getarcaneapp/arcane/backend/v2/internal/settings"
+ "github.com/getarcaneapp/arcane/backend/v2/pkg/scheduler/schedule"
)
const ExpiredSessionsCleanupJobName = "expired-sessions-cleanup"
@@ -31,8 +31,7 @@ func (j *ExpiredSessionsCleanupJob) Name() string {
}
func (j *ExpiredSessionsCleanupJob) Schedule(ctx context.Context) string {
- s := j.settingsService.GetStringSetting(ctx, "expiredSessionsCleanupInterval", "0 0 0 * * *")
- return kit.Ternary(s == "", "0 0 0 * * *", s)
+ return schedule.Or(ctx, j.settingsService.GetStringSetting(ctx, "expiredSessionsCleanupInterval", "0 0 0 * * *"), "0 0 0 * * *", ExpiredSessionsCleanupJobName)
}
func (j *ExpiredSessionsCleanupJob) Run(ctx context.Context) (schedulertypes.Outcome, error) {