X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/150d707b16a5495272dfb02d690d99bfae50c14e..522d7fd117285e4e4ce3ea5ec9b5a1722521b681:/schedule.go?ds=sidebyside diff --git a/schedule.go b/schedule.go index 9b95ce7..d2f53e0 100644 --- a/schedule.go +++ b/schedule.go @@ -115,8 +115,11 @@ func (s *Schedules) Run(ctx context.Context, l *TurnLoop) error { return err } - var timer *time.Timer - var timeout <-chan time.Time + var ( + timer *time.Timer + timeout <-chan time.Time + ) + wait, found := s.Wait(s.clock()) if found { timer = time.NewTimer(min(wait, s.check)) @@ -253,7 +256,9 @@ func (s *Schedules) Remove(id int) (string, error) { // text of the schedule. func (s *Schedules) deliver(ctx context.Context, l *TurnLoop) error { now := s.clock() + var turns []Message + for _, schedule := range s.Due(now) { message, err := l.Work(scheduleSource, schedule.Message(now), "") if err != nil { @@ -277,9 +282,9 @@ func (s *Schedules) deliver(ctx context.Context, l *TurnLoop) error { } if schedule.late(now) { - s.logger.Printf("schedule %d runs %s late, because the daemon was stopped at its time", schedule.ID, durationText(now.Sub(schedule.Due))) + s.logger.Printf("schedule %d ran %s late", schedule.ID, durationText(now.Sub(schedule.Due))) } else { - s.logger.Printf("schedule %d runs", schedule.ID) + s.logger.Printf("schedule %d ran", schedule.ID) } turns = append(turns, message) @@ -293,6 +298,7 @@ func (s *Schedules) deliver(ctx context.Context, l *TurnLoop) error { // Due returns the schedules whose time is not after now, by due time. func (s *Schedules) Due(now time.Time) []Schedule { var due []Schedule + for _, schedule := range s.sorted() { if !schedule.Due.After(now) { due = append(due, schedule) @@ -363,6 +369,7 @@ func (s *Schedules) change() { // sorted returns a copy of the schedules by due time, then by ID. func (s *Schedules) sorted() []Schedule { s.mutex.Lock() + schedules := slices.Clone(s.file.Schedules) s.mutex.Unlock()