-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #526 from sbondCo/better-tasks
Better tasks
- Loading branch information
Showing
12 changed files
with
365 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,173 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "errors" | ||
| "log/slog" | ||
| "time" | ||
|
|
||
| "github.com/go-co-op/gocron/v2" | ||
| "gorm.io/gorm" | ||
| ) | ||
|
|
||
| type TaskRescheduleRequest struct { | ||
| // Number of seconds inbetween each run of this task. | ||
| Seconds int `json:"seconds" binding:"required"` | ||
| } | ||
|
|
||
| type AllTasksResponse struct { | ||
| // The tasks name. | ||
| Name string `json:"name"` | ||
| // When this task will next run. | ||
| NextRun time.Time `json:"nextRun"` | ||
| // Current schedule for this task (seconds). | ||
| Seconds int `json:"seconds"` | ||
| } | ||
|
|
||
| type TaskFunc struct { | ||
| // Task function. | ||
| f func() | ||
| // Default duration (schedule) for task. | ||
| dd time.Duration | ||
| } | ||
|
|
||
| var taskScheduler gocron.Scheduler | ||
|
|
||
| // All task functions are stored here so when updating (rescheduling) | ||
| // a job, we can give it this function again. | ||
| // Doesn't seem to be a way to only update the schedule of a job, | ||
| // the .Update func wants the whole definition again. | ||
| // | ||
| // All funcs simply call a cleaning/routine method where the rest of the | ||
| // related code lives so it's kept tidy. | ||
| var taskFuncs map[string]TaskFunc | ||
|
|
||
| // Setup recurring tasks (eg cleanup every x mins) | ||
| func setupTasks(db *gorm.DB) { | ||
| go setupMinutelyTasks(db) | ||
| go setupDailyTasks(db) | ||
| ts, err := gocron.NewScheduler() | ||
| if err != nil { | ||
| slog.Error("SetupTasks: Failed to create new scheduler!", "error", err) | ||
| return | ||
| } | ||
| taskScheduler = ts | ||
|
|
||
| // Define all task funcs. | ||
| taskFuncs = map[string]TaskFunc{ | ||
| "Cleanup Tokens": { | ||
| f: func() { | ||
| cleanupTokens(db) | ||
| }, | ||
| dd: 60 * time.Second, | ||
| }, | ||
| "Refresh Arr Queues": { | ||
| f: func() { | ||
| refreshArrQueues() | ||
| }, | ||
| dd: 60 * time.Second, | ||
| }, | ||
| "Cleanup Images": { | ||
| f: func() { | ||
| cleanupImages(db) | ||
| }, | ||
| dd: 24 * time.Hour, | ||
| }, | ||
| } | ||
|
|
||
| // Add all jobs to scheduler. | ||
| for k, v := range taskFuncs { | ||
| err = addTaskToScheduler(k, v.dd) | ||
| if err != nil { | ||
| slog.Error("SetupTasks: Failed to add new job", "job", k, "err", err) | ||
| } | ||
| } | ||
|
|
||
| taskScheduler.Start() | ||
| slog.Info("SetupTasks: Jobs created and scheduler started.") | ||
| } | ||
|
|
||
| // Gets schedule from config, or `defaultDur` if not manually configured. | ||
| func getTaskSeconds(name string, defaultDur time.Duration) time.Duration { | ||
| s := defaultDur | ||
| if Config.TASK_SCHEDULE[name] != 0 { | ||
| s = time.Duration(Config.TASK_SCHEDULE[name]) * time.Second | ||
| } | ||
| return s | ||
| } | ||
|
|
||
| func setupMinutelyTasks(db *gorm.DB) { | ||
| taskRunInterval := 1 * time.Minute | ||
| ticker := time.NewTicker(taskRunInterval) | ||
| defer ticker.Stop() | ||
| // Add new job to scheduler. | ||
| func addTaskToScheduler(name string, defaultDur time.Duration) error { | ||
| s := getTaskSeconds(name, defaultDur) | ||
| _, err := taskScheduler.NewJob( | ||
| gocron.DurationJob(s), | ||
| gocron.NewTask(taskFuncs[name].f), | ||
| gocron.WithName(name), | ||
| ) | ||
| slog.Debug("addTaskToScheduler: Job added.", "job_name", name, "duration_used", s, "duration_default", defaultDur) | ||
| return err | ||
| } | ||
|
|
||
| for range ticker.C { | ||
| // Runs funcs that are in the place where we are cleaning. | ||
| // Bit cleaner and we can keep the related code close to its home. | ||
| cleanupTokens(db) | ||
| refreshArrQueues() | ||
| // Get all tasks in a consumable format. | ||
| func getAllTasks() []AllTasksResponse { | ||
| jobs := []AllTasksResponse{} | ||
| for _, j := range taskScheduler.Jobs() { | ||
| j2a := AllTasksResponse{ | ||
| Name: j.Name(), | ||
| } | ||
| nextRun, err := j.NextRun() | ||
| if err != nil { | ||
| slog.Error("getAllTasks: Failed to get next run time for a job.", "job_name", j2a.Name) | ||
| } else { | ||
| j2a.NextRun = nextRun | ||
| } | ||
| j2a.Seconds = int(getTaskSeconds(j2a.Name, taskFuncs[j2a.Name].dd).Seconds()) | ||
| jobs = append(jobs, j2a) | ||
| } | ||
| return jobs | ||
| } | ||
|
|
||
| func setupDailyTasks(db *gorm.DB) { | ||
| taskRunInterval := 24 * time.Hour | ||
| ticker := time.NewTicker(taskRunInterval) | ||
| defer ticker.Stop() | ||
| // Get task (job) from scheduler by name. | ||
| func getTask(name string) *gocron.Job { | ||
| var job *gocron.Job | ||
| for _, j := range taskScheduler.Jobs() { | ||
| if j.Name() == name { | ||
| job = &j | ||
| break | ||
| } | ||
| } | ||
| return job | ||
| } | ||
|
|
||
| for range ticker.C { | ||
| cleanupImages(db) | ||
| // Reschedule a task by name. | ||
| func rescheduleTask(name string, req TaskRescheduleRequest) error { | ||
| if req.Seconds == 0 { | ||
| return errors.New("request has no seconds") | ||
| } | ||
| j := getTask(name) | ||
| if j == nil { | ||
| return errors.New("no task found") | ||
| } | ||
| // Update config | ||
| if Config.TASK_SCHEDULE == nil { | ||
| Config.TASK_SCHEDULE = map[string]int{} | ||
| } | ||
| Config.TASK_SCHEDULE[name] = req.Seconds | ||
| if err := writeConfig(); err != nil { | ||
| slog.Error("rescheduleTask: Failed to write updated config to file!", "error", err) | ||
| return errors.New("failed to write config") | ||
| } | ||
| // Update job in scheduler | ||
| _, err := taskScheduler.Update( | ||
| (*j).ID(), | ||
| gocron.DurationJob( | ||
| time.Duration(req.Seconds)*time.Second, | ||
| ), | ||
| gocron.NewTask( | ||
| taskFuncs[name].f, | ||
| ), | ||
| gocron.WithName(name), | ||
| ) | ||
| if err != nil { | ||
| slog.Error("rescheduleTask: Failed to update job!", "error", err) | ||
| return errors.New("failed to update job") | ||
| } | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,5 +45,10 @@ | |
| &:hover { | ||
| border-style: solid; | ||
| } | ||
| :global(svg) { | ||
| width: 24px; | ||
| min-width: 24px; | ||
| } | ||
| } | ||
| </style> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.