Skip to content

Modern Docker Management, Designed for Everyone

fix: reschedule jobs when polling or autoupdate job settings is changed

Kyle Mendell5c3f1687dd6a
diff --git a/backend/internal/bootstrap/jobs_bootstrap.go b/backend/internal/bootstrap/jobs_bootstrap.go
index c888a938d..60f789eb5 100644
--- a/backend/internal/bootstrap/jobs_bootstrap.go
+++ b/backend/internal/bootstrap/jobs_bootstrap.go
@@ -17,10 +17,16 @@ func initializeScheduler() (*job.Scheduler, error) {
}
func registerJobs(appCtx context.Context, scheduler *job.Scheduler, appServices *Services) {
- if err := job.RegisterAutoUpdateJob(appCtx, scheduler, appServices.Updater, appServices.Settings); err != nil {
+ autoUpdateJob := job.NewAutoUpdateJob(scheduler, appServices.Updater, appServices.Settings)
+ if err := autoUpdateJob.Register(appCtx); err != nil {
slog.ErrorContext(appCtx, "Failed to register auto-update job", slog.Any("error", err))
}
+ imagePollingJob := job.NewImagePollingJob(scheduler, appServices.ImageUpdate, appServices.Settings)
+ if err := imagePollingJob.Register(appCtx); err != nil {
+ slog.ErrorContext(appCtx, "Failed to register image polling job", slog.Any("error", err))
+ }
+
if err := job.RegisterEventCleanupJob(appCtx, scheduler, appServices.Event); err != nil {
slog.ErrorContext(appCtx, "Failed to register event cleanup job", slog.Any("error", err))
}
@@ -29,7 +35,17 @@ func registerJobs(appCtx context.Context, scheduler *job.Scheduler, appServices
slog.ErrorContext(appCtx, "Failed to register filesystem watcher job", slog.Any("error", err))
}
- if err := job.RegisterImagePollingJob(appCtx, scheduler, appServices.ImageUpdate, appServices.Settings); err != nil {
- slog.ErrorContext(appCtx, "Failed to register image polling job", slog.Any("error", err))
+ appServices.Settings.OnImagePollingSettingsChanged = func(ctx context.Context) {
+ if err := imagePollingJob.Reschedule(ctx); err != nil {
+ slog.WarnContext(ctx, "Failed to reschedule image-polling job", slog.Any("error", err))
+ }
+ if err := autoUpdateJob.Reschedule(ctx); err != nil {
+ slog.WarnContext(ctx, "Failed to reschedule auto-update job", slog.Any("error", err))
+ }
+ }
+ appServices.Settings.OnAutoUpdateSettingsChanged = func(ctx context.Context) {
+ if err := autoUpdateJob.Reschedule(ctx); err != nil {
+ slog.WarnContext(ctx, "Failed to reschedule auto-update job", slog.Any("error", err))
+ }
}
}
diff --git a/backend/internal/job/auto_update_job.go b/backend/internal/job/auto_update_job.go
index 6128975f2..c2f307061 100644
--- a/backend/internal/job/auto_update_job.go
+++ b/backend/internal/job/auto_update_job.go
@@ -12,42 +12,52 @@ import (
type AutoUpdateJob struct {
updaterService *services.UpdaterService
settingsService *services.SettingsService
+ scheduler *Scheduler
}
-func NewAutoUpdateJob(updaterService *services.UpdaterService, settingsService *services.SettingsService) *AutoUpdateJob {
+func NewAutoUpdateJob(scheduler *Scheduler, updaterService *services.UpdaterService, settingsService *services.SettingsService) *AutoUpdateJob {
return &AutoUpdateJob{
updaterService: updaterService,
settingsService: settingsService,
+ scheduler: scheduler,
}
}
func RegisterAutoUpdateJob(ctx context.Context, scheduler *Scheduler, updaterService *services.UpdaterService, settingsService *services.SettingsService) error {
- autoUpdateEnabled := settingsService.GetBoolSetting(ctx, "autoUpdate", false)
- autoUpdateInterval := settingsService.GetIntSetting(ctx, "autoUpdateInterval", 1440)
+ j := NewAutoUpdateJob(scheduler, updaterService, settingsService)
+ return j.Register(ctx)
+}
+
+func (j *AutoUpdateJob) Register(ctx context.Context) error {
+ autoUpdateEnabled := j.settingsService.GetBoolSetting(ctx, "autoUpdate", false)
+ pollingEnabled := j.settingsService.GetBoolSetting(ctx, "pollingEnabled", true)
+ autoUpdateInterval := j.settingsService.GetIntSetting(ctx, "autoUpdateInterval", 1440)
- if !autoUpdateEnabled {
- slog.InfoContext(ctx, "auto-update disabled; job not registered")
+ if !autoUpdateEnabled || !pollingEnabled {
+ slog.InfoContext(ctx, "auto-update disabled or polling disabled; job not registered",
+ "autoUpdate", autoUpdateEnabled, "pollingEnabled", pollingEnabled)
return nil
}
interval := time.Duration(autoUpdateInterval) * time.Minute
if interval < 5*time.Minute {
slog.WarnContext(ctx, "auto-update interval too low; using default",
- "requested_seconds", autoUpdateInterval,
+ "requested_minutes", autoUpdateInterval,
"effective_interval", "60m")
interval = 60 * time.Minute
}
slog.InfoContext(ctx, "registering auto-update job", "interval", interval.String())
- job := NewAutoUpdateJob(updaterService, settingsService)
- jobDefinition := gocron.DurationJob(interval)
+ // ensure single instance
+ j.scheduler.RemoveJobByName("auto-update")
- return scheduler.RegisterJob(
+ jobDefinition := gocron.DurationJob(interval)
+ return j.scheduler.RegisterJob(
ctx,
"auto-update",
jobDefinition,
- job.Execute,
+ j.Execute,
false,
)
}
@@ -56,8 +66,10 @@ func (j *AutoUpdateJob) Execute(ctx context.Context) error {
slog.InfoContext(ctx, "auto-update run started")
enabled := j.settingsService.GetBoolSetting(ctx, "autoUpdate", false)
- if !enabled {
- slog.InfoContext(ctx, "auto-update disabled; skipping run")
+ pollingEnabled := j.settingsService.GetBoolSetting(ctx, "pollingEnabled", true)
+ if !enabled || !pollingEnabled {
+ slog.InfoContext(ctx, "auto-update disabled or polling disabled; skipping run",
+ "autoUpdate", enabled, "pollingEnabled", pollingEnabled)
return nil
}
@@ -78,16 +90,32 @@ func (j *AutoUpdateJob) Execute(ctx context.Context) error {
}
func UpdateAutoUpdateJobSchedule(ctx context.Context, scheduler *Scheduler, updaterService *services.UpdaterService, settingsService *services.SettingsService) error {
- autoUpdateEnabled := settingsService.GetBoolSetting(ctx, "autoUpdate", false)
- autoUpdateInterval := settingsService.GetIntSetting(ctx, "autoUpdateInterval", 300)
+ j := NewAutoUpdateJob(scheduler, updaterService, settingsService)
+ return j.Reschedule(ctx)
+}
+
+func (j *AutoUpdateJob) Reschedule(ctx context.Context) error {
+ autoUpdateEnabled := j.settingsService.GetBoolSetting(ctx, "autoUpdate", false)
+ pollingEnabled := j.settingsService.GetBoolSetting(ctx, "pollingEnabled", true)
+ autoUpdateInterval := j.settingsService.GetIntSetting(ctx, "autoUpdateInterval", 1440)
- if !autoUpdateEnabled {
- slog.InfoContext(ctx, "auto-update disabled; job will be skipped")
+ if !autoUpdateEnabled || !pollingEnabled {
+ j.scheduler.RemoveJobByName("auto-update")
+ slog.InfoContext(ctx, "auto-update disabled or polling disabled; removed job if present",
+ "autoUpdate", autoUpdateEnabled, "pollingEnabled", pollingEnabled)
return nil
}
- interval := time.Duration(autoUpdateInterval) * time.Second
- slog.InfoContext(ctx, "auto-update settings changed", "interval", interval.String())
+ interval := time.Duration(autoUpdateInterval) * time.Minute
+ if interval < 5*time.Minute {
+ interval = 60 * time.Minute
+ }
+ slog.InfoContext(ctx, "auto-update settings changed; rescheduling", "interval", interval.String())
- return nil
+ return j.scheduler.RescheduleDurationJobByName(ctx, "auto-update", interval, j.Execute, false)
+}
+
+func (j *AutoUpdateJob) Remove(ctx context.Context) {
+ j.scheduler.RemoveJobByName("auto-update")
+ slog.InfoContext(ctx, "auto-update job removed")
}
diff --git a/backend/internal/job/image_polling_job.go b/backend/internal/job/image_polling_job.go
index 70609d00c..5434b5828 100644
--- a/backend/internal/job/image_polling_job.go
+++ b/backend/internal/job/image_polling_job.go
@@ -12,18 +12,25 @@ import (
type ImagePollingJob struct {
imageUpdateService *services.ImageUpdateService
settingsService *services.SettingsService
+ scheduler *Scheduler
}
-func NewImagePollingJob(imageUpdateService *services.ImageUpdateService, settingsService *services.SettingsService) *ImagePollingJob {
+func NewImagePollingJob(scheduler *Scheduler, imageUpdateService *services.ImageUpdateService, settingsService *services.SettingsService) *ImagePollingJob {
return &ImagePollingJob{
imageUpdateService: imageUpdateService,
settingsService: settingsService,
+ scheduler: scheduler,
}
}
func RegisterImagePollingJob(ctx context.Context, scheduler *Scheduler, imageUpdateService *services.ImageUpdateService, settingsService *services.SettingsService) error {
- pollingEnabled := settingsService.GetBoolSetting(ctx, "pollingEnabled", true)
- pollingInterval := settingsService.GetIntSetting(ctx, "pollingInterval", 60)
+ j := NewImagePollingJob(scheduler, imageUpdateService, settingsService)
+ return j.Register(ctx)
+}
+
+func (j *ImagePollingJob) Register(ctx context.Context) error {
+ pollingEnabled := j.settingsService.GetBoolSetting(ctx, "pollingEnabled", true)
+ pollingInterval := j.settingsService.GetIntSetting(ctx, "pollingInterval", 60)
if !pollingEnabled {
slog.InfoContext(ctx, "polling disabled; job not registered")
@@ -33,21 +40,22 @@ func RegisterImagePollingJob(ctx context.Context, scheduler *Scheduler, imageUpd
interval := time.Duration(pollingInterval) * time.Minute
if interval < 5*time.Minute {
slog.WarnContext(ctx, "polling interval too low; using default",
- "requested_seconds", pollingInterval,
+ "requested_minutes", pollingInterval,
"effective_interval", "60m")
interval = 60 * time.Minute
}
slog.InfoContext(ctx, "registering image polling job", "interval", interval.String())
- job := NewImagePollingJob(imageUpdateService, settingsService)
- jobDefinition := gocron.DurationJob(interval)
+ // ensure single instance
+ j.scheduler.RemoveJobByName("image-polling")
- return scheduler.RegisterJob(
+ jobDefinition := gocron.DurationJob(interval)
+ return j.scheduler.RegisterJob(
ctx,
"image-polling",
jobDefinition,
- job.Execute,
+ j.Execute,
false,
)
}
@@ -87,16 +95,30 @@ func (j *ImagePollingJob) Execute(ctx context.Context) error {
}
func UpdateImagePollingJobSchedule(ctx context.Context, scheduler *Scheduler, imageUpdateService *services.ImageUpdateService, settingsService *services.SettingsService) error {
- pollingEnabled := settingsService.GetBoolSetting(ctx, "pollingEnabled", true)
- pollingInterval := settingsService.GetIntSetting(ctx, "pollingInterval", 300)
+ j := NewImagePollingJob(scheduler, imageUpdateService, settingsService)
+ return j.Reschedule(ctx)
+}
+
+func (j *ImagePollingJob) Reschedule(ctx context.Context) error {
+ pollingEnabled := j.settingsService.GetBoolSetting(ctx, "pollingEnabled", true)
+ pollingInterval := j.settingsService.GetIntSetting(ctx, "pollingInterval", 60)
if !pollingEnabled {
- slog.InfoContext(ctx, "polling job disabled; job will be skipped")
+ j.scheduler.RemoveJobByName("image-polling")
+ slog.InfoContext(ctx, "polling disabled; removed image-polling job if present")
return nil
}
- interval := time.Duration(pollingInterval) * time.Second
- slog.InfoContext(ctx, "polling settings changed", "interval", interval.String())
+ interval := time.Duration(pollingInterval) * time.Minute
+ if interval < 5*time.Minute {
+ interval = 60 * time.Minute
+ }
+ slog.InfoContext(ctx, "polling settings changed; rescheduling", "interval", interval.String())
- return nil
+ return j.scheduler.RescheduleDurationJobByName(ctx, "image-polling", interval, j.Execute, false)
+}
+
+func (j *ImagePollingJob) Remove(ctx context.Context) {
+ j.scheduler.RemoveJobByName("image-polling")
+ slog.InfoContext(ctx, "image-polling job removed")
}
diff --git a/backend/internal/job/job.go b/backend/internal/job/job.go
index 948330d34..6884374cd 100644
--- a/backend/internal/job/job.go
+++ b/backend/internal/job/job.go
@@ -4,6 +4,7 @@ import (
"context"
"fmt"
"log/slog"
+ "time" // added
"github.com/go-co-op/gocron/v2"
"github.com/google/uuid"
@@ -48,6 +49,7 @@ func (s *Scheduler) RegisterJob(
) error {
jobOptions := []gocron.JobOption{
gocron.WithContext(ctx),
+ gocron.WithName(name),
gocron.WithEventListeners(
gocron.BeforeJobRuns(func(jobID uuid.UUID, jobName string) {
slog.InfoContext(ctx, "Job starting", slog.String("name", name), slog.String("id", jobID.String()))
@@ -80,3 +82,23 @@ func (s *Scheduler) RegisterJob(
slog.InfoContext(ctx, "Job registered successfully", slog.String("name", name))
return nil
}
+
+func (s *Scheduler) RemoveJobByName(name string) {
+ for _, j := range s.scheduler.Jobs() {
+ if j.Name() == name {
+ _ = s.scheduler.RemoveJob(j.ID())
+ }
+ }
+}
+
+func (s *Scheduler) RescheduleDurationJobByName(
+ ctx context.Context,
+ name string,
+ interval time.Duration,
+ taskFunc func(ctx context.Context) error,
+ runImmediately bool,
+) error {
+ s.RemoveJobByName(name)
+ definition := gocron.DurationJob(interval)
+ return s.RegisterJob(ctx, name, definition, taskFunc, runImmediately)
+}
diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.go
index c0447ac50..135d4d47f 100644
--- a/backend/internal/services/settings_service.go
+++ b/backend/internal/services/settings_service.go
@@ -22,6 +22,9 @@ import (
type SettingsService struct {
db *database.DB
config *config.Config
+
+ OnImagePollingSettingsChanged func(ctx context.Context)
+ OnAutoUpdateSettingsChanged func(ctx context.Context)
}
func NewSettingsService(db *database.DB, cfg *config.Config) *SettingsService {
@@ -165,6 +168,9 @@ func (s *SettingsService) UpdateSettings(ctx context.Context, updates dto.Update
rv := reflect.ValueOf(updates)
valuesToUpdate := make([]models.SettingVariable, 0)
+ changedPolling := false
+ changedAutoUpdate := false
+
// Iterate through fields using reflection
for i := 0; i < rt.NumField(); i++ {
field := rt.Field(i)
@@ -209,6 +215,13 @@ func (s *SettingsService) UpdateSettings(ctx context.Context, updates dto.Update
Key: key,
Value: valueToSave,
})
+
+ switch key {
+ case "pollingEnabled", "pollingInterval":
+ changedPolling = true
+ case "autoUpdate", "autoUpdateInterval":
+ changedAutoUpdate = true
+ }
}
err = s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
@@ -219,7 +232,6 @@ func (s *SettingsService) UpdateSettings(ctx context.Context, updates dto.Update
}
return nil
})
-
if err != nil {
return nil, err
}
@@ -258,6 +270,13 @@ func (s *SettingsService) UpdateSettings(ctx context.Context, updates dto.Update
}
}
+ if changedPolling && s.OnImagePollingSettingsChanged != nil {
+ s.OnImagePollingSettingsChanged(ctx)
+ }
+ if changedAutoUpdate && s.OnAutoUpdateSettingsChanged != nil {
+ s.OnAutoUpdateSettingsChanged(ctx)
+ }
+
settings, err := s.GetSettings(ctx)
if err != nil {
return nil, fmt.Errorf("failed to retrieve updated settings: %w", err)
diff --git a/frontend/package.json b/frontend/package.json
index 05836eecb..fe0252b2f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -3,7 +3,7 @@
"private": true,
"version": "1.0.2",
"type": "module",
- "packageManager": "[email protected]",
+ "packageManager": "[email protected]",
"scripts": {
"dev": "vite dev --port 3000",
"build": "vite build",
diff --git a/package.json b/package.json
index 4427f0e18..32701eea6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "arcane-repo",
"private": true,
- "packageManager": "[email protected]",
+ "packageManager": "[email protected]",
"workspaces": [
"frontend",
"tests"
diff --git a/tests/package.json b/tests/package.json
index 67059f1ea..9ede30d35 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -1,7 +1,7 @@
{
"type": "module",
"name": "arcane-tests",
- "packageManager": "[email protected]",
+ "packageManager": "[email protected]",
"scripts": {
"preinstall": "npx only-allow pnpm",
"test": "playwright test"