diff options
Diffstat (limited to 'internal/server/scheduler.go')
| -rw-r--r-- | internal/server/scheduler.go | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/internal/server/scheduler.go b/internal/server/scheduler.go index cc51b7e..fa47d2e 100644 --- a/internal/server/scheduler.go +++ b/internal/server/scheduler.go @@ -16,10 +16,12 @@ import ( gossh "golang.org/x/crypto/ssh" ) -type scheduler struct{} +type scheduler struct { + cfg config.RuntimeConfig +} -func newScheduler() *scheduler { - return &scheduler{} +func newScheduler(cfg config.RuntimeConfig) *scheduler { + return &scheduler{cfg: cfg} } func (s *scheduler) start(ctx context.Context) { @@ -27,9 +29,11 @@ func (s *scheduler) start(ctx context.Context) { // First run after just 10s! time.Sleep(time.Second * 2) s.runJobs(ctx) + runTicker := time.NewTicker(time.Minute) + defer runTicker.Stop() for { select { - case <-time.After(time.Minute): + case <-runTicker.C: s.runJobs(ctx) case <-ctx.Done(): return @@ -38,7 +42,8 @@ func (s *scheduler) start(ctx context.Context) { } func (s *scheduler) runJobs(ctx context.Context) { - for _, job := range config.Server.Schedule { + for i := range s.cfg.Server.Schedule { + job := &s.cfg.Server.Schedule[i] if !job.Enable { dlog.Server.Debug(job.Name, "Not running job as not enabled") continue @@ -56,7 +61,7 @@ func (s *scheduler) runJobs(ctx context.Context) { } } -func (s *scheduler) runJob(ctx context.Context, job config.Scheduled) { +func (s *scheduler) runJob(ctx context.Context, job *config.Scheduled) { files := fillDates(job.Files) outfile := fillDates(job.Outfile) @@ -68,7 +73,7 @@ func (s *scheduler) runJob(ctx context.Context, job config.Scheduled) { servers := strings.Join(job.Servers, ",") if servers == "" { - servers = config.Server.SSHBindAddress + servers = s.cfg.Server.SSHBindAddress } args := config.Args{ ConnectionsPerCPU: config.DefaultConnectionsPerCPU, |