Skip to content

Modern Docker Management, Designed for Everyone

fix: certain jobs not being adding to job scheduler (#1612)

Kyle Mendell5c658e557621
diff --git a/backend/internal/bootstrap/jobs_bootstrap.go b/backend/internal/bootstrap/jobs_bootstrap.go
index 4fef08211..182336a74 100644
--- a/backend/internal/bootstrap/jobs_bootstrap.go
+++ b/backend/internal/bootstrap/jobs_bootstrap.go
@@ -37,32 +37,100 @@ func registerJobs(appCtx context.Context, newScheduler *pkg_scheduler.JobSchedul
gitOpsSyncJob := pkg_scheduler.NewGitOpsSyncJob(appServices.GitOpsSync, appServices.Settings)
newScheduler.RegisterJob(gitOpsSyncJob)
- setupJobScheduleCallbacks(appServices, appConfig, newScheduler, environmentHealthJob, analyticsJob, eventCleanupJob)
+ setupJobScheduleCallbacks(
+ appServices,
+ appConfig,
+ newScheduler,
+ imagePollingJob,
+ autoUpdateJob,
+ environmentHealthJob,
+ analyticsJob,
+ eventCleanupJob,
+ scheduledPruneJob,
+ gitOpsSyncJob,
+ )
setupSettingsCallbacks(appServices, appConfig, newScheduler, imagePollingJob, autoUpdateJob, environmentHealthJob, fsWatcherJob, scheduledPruneJob)
}
-func setupJobScheduleCallbacks(appServices *Services, appConfig *config.Config, newScheduler *pkg_scheduler.JobScheduler, environmentHealthJob *pkg_scheduler.EnvironmentHealthJob, analyticsJob *pkg_scheduler.AnalyticsJob, eventCleanupJob *pkg_scheduler.EventCleanupJob) {
- if appServices.JobSchedule != nil {
- appServices.JobSchedule.OnJobSchedulesChanged = func(ctx context.Context, changedKeys []string) {
- for _, key := range changedKeys {
- switch key {
- case "environmentHealthInterval":
- if appConfig.AgentMode {
- continue
- }
- if err := newScheduler.RescheduleJob(ctx, environmentHealthJob); err != nil {
- slog.WarnContext(ctx, "Failed to reschedule environment-health job", "error", err)
- }
- case "analyticsHeartbeatInterval":
- if err := newScheduler.RescheduleJob(ctx, analyticsJob); err != nil {
- slog.WarnContext(ctx, "Failed to reschedule analytics heartbeat job", "error", err)
- }
- case "eventCleanupInterval":
- if err := newScheduler.RescheduleJob(ctx, eventCleanupJob); err != nil {
- slog.WarnContext(ctx, "Failed to reschedule event cleanup job", "error", err)
- }
- }
- }
+func setupJobScheduleCallbacks(
+ appServices *Services,
+ appConfig *config.Config,
+ newScheduler *pkg_scheduler.JobScheduler,
+ imagePollingJob *pkg_scheduler.ImagePollingJob,
+ autoUpdateJob *pkg_scheduler.AutoUpdateJob,
+ environmentHealthJob *pkg_scheduler.EnvironmentHealthJob,
+ analyticsJob *pkg_scheduler.AnalyticsJob,
+ eventCleanupJob *pkg_scheduler.EventCleanupJob,
+ scheduledPruneJob *pkg_scheduler.ScheduledPruneJob,
+ gitOpsSyncJob *pkg_scheduler.GitOpsSyncJob,
+) {
+ if appServices.JobSchedule == nil {
+ return
+ }
+
+ appServices.JobSchedule.OnJobSchedulesChanged = func(ctx context.Context, changedKeys []string) {
+ for _, key := range changedKeys {
+ handleJobScheduleChangeInternal(
+ ctx,
+ key,
+ appConfig,
+ newScheduler,
+ imagePollingJob,
+ autoUpdateJob,
+ environmentHealthJob,
+ analyticsJob,
+ eventCleanupJob,
+ scheduledPruneJob,
+ gitOpsSyncJob,
+ )
+ }
+ }
+}
+
+func handleJobScheduleChangeInternal(
+ ctx context.Context,
+ key string,
+ appConfig *config.Config,
+ newScheduler *pkg_scheduler.JobScheduler,
+ imagePollingJob *pkg_scheduler.ImagePollingJob,
+ autoUpdateJob *pkg_scheduler.AutoUpdateJob,
+ environmentHealthJob *pkg_scheduler.EnvironmentHealthJob,
+ analyticsJob *pkg_scheduler.AnalyticsJob,
+ eventCleanupJob *pkg_scheduler.EventCleanupJob,
+ scheduledPruneJob *pkg_scheduler.ScheduledPruneJob,
+ gitOpsSyncJob *pkg_scheduler.GitOpsSyncJob,
+) {
+ switch key {
+ case "pollingInterval":
+ if err := newScheduler.RescheduleJob(ctx, imagePollingJob); err != nil {
+ slog.WarnContext(ctx, "Failed to reschedule image-polling job", "error", err)
+ }
+ case "autoUpdateInterval":
+ if err := newScheduler.RescheduleJob(ctx, autoUpdateJob); err != nil {
+ slog.WarnContext(ctx, "Failed to reschedule auto-update job", "error", err)
+ }
+ case "environmentHealthInterval":
+ if appConfig.AgentMode {
+ return
+ }
+ if err := newScheduler.RescheduleJob(ctx, environmentHealthJob); err != nil {
+ slog.WarnContext(ctx, "Failed to reschedule environment-health job", "error", err)
+ }
+ case "analyticsHeartbeatInterval":
+ if err := newScheduler.RescheduleJob(ctx, analyticsJob); err != nil {
+ slog.WarnContext(ctx, "Failed to reschedule analytics heartbeat job", "error", err)
+ }
+ case "eventCleanupInterval":
+ if err := newScheduler.RescheduleJob(ctx, eventCleanupJob); err != nil {
+ slog.WarnContext(ctx, "Failed to reschedule event cleanup job", "error", err)
+ }
+ case "scheduledPruneInterval":
+ if err := newScheduler.RescheduleJob(ctx, scheduledPruneJob); err != nil {
+ slog.WarnContext(ctx, "Failed to reschedule scheduled-prune job", "error", err)
+ }
+ case "gitopsSyncInterval":
+ if err := newScheduler.RescheduleJob(ctx, gitOpsSyncJob); err != nil {
+ slog.WarnContext(ctx, "Failed to reschedule gitops sync job", "error", err)
}
}
}
diff --git a/backend/pkg/scheduler/scheduled_prune_job.go b/backend/pkg/scheduler/scheduled_prune_job.go
index 18c223168..289d66821 100644
--- a/backend/pkg/scheduler/scheduled_prune_job.go
+++ b/backend/pkg/scheduler/scheduled_prune_job.go
@@ -8,6 +8,7 @@ import (
"github.com/getarcaneapp/arcane/backend/internal/services"
"github.com/getarcaneapp/arcane/types/system"
+ "github.com/robfig/cron/v3"
)
const ScheduledPruneJobName = "scheduled-prune"
@@ -29,26 +30,33 @@ func (j *ScheduledPruneJob) Name() string {
}
func (j *ScheduledPruneJob) Schedule(ctx context.Context) string {
- s := j.settingsService.GetStringSetting(ctx, "scheduledPruneInterval", "0 0 0 * * *")
- if s == "" {
- return "0 0 0 * * *"
+ schedule := j.settingsService.GetStringSetting(ctx, "scheduledPruneInterval", "0 0 0 * * *")
+ if schedule == "" {
+ schedule = "0 0 0 * * *"
}
// Handle legacy straight int if it somehow didn't get migrated
- if i, err := strconv.Atoi(s); err == nil {
+ if i, err := strconv.Atoi(schedule); err == nil {
if i <= 0 {
i = 1440
}
- if i%1440 == 0 {
- return fmt.Sprintf("0 0 0 */%d * *", i/1440)
- }
- if i%60 == 0 {
- return fmt.Sprintf("0 0 */%d * * *", i/60)
+ switch {
+ case i%1440 == 0:
+ schedule = fmt.Sprintf("0 0 0 */%d * *", i/1440)
+ case i%60 == 0:
+ schedule = fmt.Sprintf("0 0 */%d * * *", i/60)
+ default:
+ schedule = fmt.Sprintf("0 */%d * * * *", i)
}
- return fmt.Sprintf("0 */%d * * * *", i)
}
- return s
+ parser := cron.NewParser(cron.Second | cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow)
+ if _, err := parser.Parse(schedule); err != nil {
+ slog.WarnContext(ctx, "Invalid cron expression for scheduled-prune, using default", "invalid_schedule", schedule, "error", err)
+ return "0 0 0 * * *"
+ }
+
+ return schedule
}
func (j *ScheduledPruneJob) Run(ctx context.Context) {
@@ -99,6 +107,9 @@ func (j *ScheduledPruneJob) Run(ctx context.Context) {
"networks_deleted", len(result.NetworksDeleted),
"errors", len(result.Errors),
)
+ if len(result.Errors) > 0 {
+ slog.DebugContext(ctx, "scheduled prune run errors", "errors", result.Errors)
+ }
}
func (j *ScheduledPruneJob) Reschedule(ctx context.Context) error {
diff --git a/backend/pkg/scheduler/scheduler.go b/backend/pkg/scheduler/scheduler.go
index 5959178bc..194a5e8c3 100644
--- a/backend/pkg/scheduler/scheduler.go
+++ b/backend/pkg/scheduler/scheduler.go
@@ -49,7 +49,7 @@ func (js *JobScheduler) StartScheduler() {
slog.InfoContext(js.context, "Job finished", "name", currentJob.Name())
})
if err != nil {
- slog.ErrorContext(js.context, "Failed to schedule job", "name", currentJob.Name(), "error", err)
+ slog.ErrorContext(js.context, "Failed to schedule job", "name", currentJob.Name(), "schedule", schedule, "error", err)
continue
}