Keep time limits with their operations

[onechat] / schedule.go

diff --git a/schedule.go b/schedule.go
index b3a65ea94193a6431693313ca6f5833d836ccefb..a1eba1c1665f11e35cb800a71a25978dd30f6fa6 100644 (file)
--- a/schedule.go
+++ b/schedule.go
@@ -58,7 +58,6 @@ func openSchedules(path, owner string, clock func() time.Time, logger *slog.Logg
                owner:   owner,
                clock:   clock,
                logger:  logger,
                owner:   owner,
                clock:   clock,
                logger:  logger,

-               check:   scheduleCheck,

                changed: make(chan struct{}, 1),
        }
 
                changed: make(chan struct{}, 1),
        }
 


@@ -118,7 +117,6 @@ type Schedules struct {
        owner   string
        clock   func() time.Time
        logger  *slog.Logger
        owner   string
        clock   func() time.Time
        logger  *slog.Logger

-       check   time.Duration

        changed chan struct{}
 
        mutex sync.Mutex
        changed chan struct{}
 
        mutex sync.Mutex


@@ -126,9 +124,9 @@ type Schedules struct {
 }
 
 // Run starts the runs of the due schedules in l until ctx ends. It waits until
 }
 
 // Run starts the runs of the due schedules in l until ctx ends. It waits until

-// the first due time, at most check at a time, and also wakes at a set or a
-// remove. So a schedule that came due while the daemon was stopped runs at the
-// start. It returns the error of a write of the log or of the file.
+// the first due time, at most scheduleCheck at a time, and also wakes at a set
+// or a remove. So a schedule that came due while the daemon was stopped runs at
+// the start. It returns the error of a write of the log or of the file.

 func (s *Schedules) Run(ctx context.Context, l *TurnLoop) error {
        for {
                err := s.deliver(ctx, l)
 func (s *Schedules) Run(ctx context.Context, l *TurnLoop) error {
        for {
                err := s.deliver(ctx, l)


@@ -143,7 +141,7 @@ func (s *Schedules) Run(ctx context.Context, l *TurnLoop) error {
 
                wait, found := s.Wait(s.clock())
                if found {
 
                wait, found := s.Wait(s.clock())
                if found {

-                       timer = time.NewTimer(min(wait, s.check))
+                       timer = time.NewTimer(min(wait, scheduleCheck))

                        timeout = timer.C
                }
 
                        timeout = timer.C
                }