Keep each schedule with its owning agent

[onechat] / schedule.go

diff --git a/schedule.go b/schedule.go
index 9b95ce7a5722319630fa8bcf27fb0e8f8fc16511..b3a65ea94193a6431693313ca6f5833d836ccefb 100644 (file)
--- a/schedule.go
+++ b/schedule.go
@@ -6,7 +6,7 @@ import (
        "encoding/json"
        "errors"
        "fmt"
        "encoding/json"
        "errors"
        "fmt"

-       "log"
+       "log/slog"

        "os"
        "slices"
        "strconv"
        "os"
        "slices"
        "strconv"


@@ -49,11 +49,13 @@ const (
 )
 
 // openSchedules reads the schedules of the file at path. A missing file holds
 )
 
 // openSchedules reads the schedules of the file at path. A missing file holds

-// none. The clock gives the time and the time zone of the schedules, and logger
-// gets one line for each run.
-func openSchedules(path string, clock func() time.Time, logger *log.Logger) (*Schedules, error) {
+// none. The owner names its agent. Schedules without an owner take this name. A
+// different stored owner is an error. The clock gives the time and the time
+// zone of the schedules, and logger gets one line for each run.
+func openSchedules(path, owner string, clock func() time.Time, logger *slog.Logger) (*Schedules, error) {

        s := &Schedules{
                path:    path,
        s := &Schedules{
                path:    path,

+               owner:   owner,

                clock:   clock,
                logger:  logger,
                check:   scheduleCheck,
                clock:   clock,
                logger:  logger,
                check:   scheduleCheck,


@@ -74,7 +76,18 @@ func openSchedules(path string, clock func() time.Time, logger *log.Logger) (*Sc
                return nil, fmt.Errorf("%s: %w", path, err)
        }
 
                return nil, fmt.Errorf("%s: %w", path, err)
        }
 

-       for _, schedule := range s.file.Schedules {
+       changed := false
+       for i := range s.file.Schedules {
+               schedule := &s.file.Schedules[i]
+               if schedule.Owner == "" {
+                       schedule.Owner = owner
+                       changed = true
+               }
+
+               if schedule.Owner != owner {
+                       return nil, fmt.Errorf("schedule %d belongs to %q, not %q", schedule.ID, schedule.Owner, owner)
+               }
+

                if schedule.Cron == "" {
                        continue
                }
                if schedule.Cron == "" {
                        continue
                }


@@ -85,6 +98,13 @@ func openSchedules(path string, clock func() time.Time, logger *log.Logger) (*Sc
                }
        }
 
                }
        }
 

+       if changed {
+               err = s.save()
+               if err != nil {
+                       return nil, fmt.Errorf("record schedule owner: %w", err)
+               }
+       }
+

        return s, nil
 }
 
        return s, nil
 }
 


@@ -95,8 +115,9 @@ func openSchedules(path string, clock func() time.Time, logger *log.Logger) (*Sc
 // changed tells Run that a set or a remove changed the times.
 type Schedules struct {
        path    string
 // changed tells Run that a set or a remove changed the times.
 type Schedules struct {
        path    string

+       owner   string

        clock   func() time.Time
        clock   func() time.Time

-       logger  *log.Logger
+       logger  *slog.Logger

        check   time.Duration
        changed chan struct{}
 
        check   time.Duration
        changed chan struct{}
 


@@ -115,8 +136,11 @@ func (s *Schedules) Run(ctx context.Context, l *TurnLoop) error {
                        return err
                }
 
                        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))
                wait, found := s.Wait(s.clock())
                if found {
                        timer = time.NewTimer(min(wait, s.check))


@@ -148,7 +172,8 @@ func (s *Schedules) Set(text string, at, cron *string) (string, error) {
 
        now := s.clock()
        schedule := Schedule{
 
        now := s.clock()
        schedule := Schedule{

-               Text: text,
+               Text:  text,
+               Owner: s.owner,

        }
 
        switch {
        }
 
        switch {


@@ -252,8 +277,14 @@ func (s *Schedules) Remove(id int) (string, error) {
 // the ID of the schedule and, for a late run, how late it is. The line holds no
 // text of the schedule.
 func (s *Schedules) deliver(ctx context.Context, l *TurnLoop) error {
 // the ID of the schedule and, for a late run, how late it is. The line holds no
 // text of the schedule.
 func (s *Schedules) deliver(ctx context.Context, l *TurnLoop) error {

+       if l.agent.config.Name != s.owner {
+               return fmt.Errorf("schedule owner %q does not match agent %q", s.owner, l.agent.config.Name)
+       }
+

        now := s.clock()
        now := s.clock()

+

        var turns []Message
        var turns []Message

+

        for _, schedule := range s.Due(now) {
                message, err := l.Work(scheduleSource, schedule.Message(now), "")
                if err != nil {
        for _, schedule := range s.Due(now) {
                message, err := l.Work(scheduleSource, schedule.Message(now), "")
                if err != nil {


@@ -276,12 +307,13 @@ func (s *Schedules) deliver(ctx context.Context, l *TurnLoop) error {
                        return err
                }
 
                        return err
                }
 

+               attrs := []any{"id", schedule.ID}

                if schedule.late(now) {
                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)))
-               } else {
-                       s.logger.Printf("schedule %d runs", schedule.ID)
+                       attrs = append(attrs, "late", now.Sub(schedule.Due))

                }
 
                }
 

+               s.logger.Info("schedule ran", attrs...)
+

                turns = append(turns, message)
        }
 
                turns = append(turns, message)
        }
 


@@ -293,6 +325,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
 // 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)
        for _, schedule := range s.sorted() {
                if !schedule.Due.After(now) {
                        due = append(due, schedule)


@@ -363,6 +396,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()
 // 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()
 
        schedules := slices.Clone(s.file.Schedules)
        s.mutex.Unlock()
 


@@ -394,13 +428,15 @@ type ScheduleFile struct {
        Schedules []Schedule `json:"schedules"`
 }
 
        Schedules []Schedule `json:"schedules"`
 }
 

-// Schedule is one schedule: its ID, the task for the agent, the cron expression
-// of a repeating schedule, empty for a one-time schedule, and its next time.
+// Schedule is one schedule: its owner, its ID, the task for the agent, the cron
+// expression of a repeating schedule, empty for a one-time schedule, and its
+// next time.

 type Schedule struct {
 type Schedule struct {

-       ID   int       `json:"id"`
-       Text string    `json:"text"`
-       Cron string    `json:"cron"`
-       Due  time.Time `json:"due"`
+       Owner string    `json:"owner"`
+       ID    int       `json:"id"`
+       Text  string    `json:"text"`
+       Cron  string    `json:"cron"`
+       Due   time.Time `json:"due"`

 }
 
 // Message returns the text of a run at now for the log, with the times in the
 }
 
 // Message returns the text of a run at now for the log, with the times in the