opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge fix/cron-file-integrity: reload store on external file change; only save when state changes

Browse source
This commit is contained in:
Eric Jacksch 2026-03-20 12:00:32 -04:00
commit c257e3ff59
1 changed files with 44 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
pkg/cron/service.go
View file

@ -59,13 +59,14 @@ type CronStore struct {
type JobHandler func(job *CronJob) (string, error) type JobHandler func(job *CronJob) (string, error)
type CronService struct { type CronService struct {
storePath string storePath string
store *CronStore store *CronStore
onJob JobHandler onJob JobHandler
mu sync.RWMutex mu sync.RWMutex
running bool running bool
stopChan chan struct{} stopChan chan struct{}
gronx *gronx.Gronx gronx *gronx.Gronx
fileModTime time.Time // mtime of store file at last load or save
} }
func NewCronService(storePath string, onJob JobHandler) *CronService { func NewCronService(storePath string, onJob JobHandler) *CronService {
@ -140,6 +141,13 @@ func (cs *CronService) checkJobs() {
return return
} }
// Reload from disk if the file was modified externally (e.g. by the CLI).
if info, err := os.Stat(cs.storePath); err == nil && info.ModTime().After(cs.fileModTime) {
if err := cs.loadStore(); err != nil {
log.Printf("[cron] failed to reload store: %v", err)
}
}
now := time.Now().UnixMilli() now := time.Now().UnixMilli()
var dueJobIDs []string var dueJobIDs []string
@ -151,19 +159,23 @@ func (cs *CronService) checkJobs() {
} }
} }
// Reset next run for due jobs before unlocking to avoid duplicate execution. // Only persist state when there are due jobs to avoid clobbering
dueMap := make(map[string]bool, len(dueJobIDs)) // concurrent writes from the CLI or other processes.
for _, jobID := range dueJobIDs { if len(dueJobIDs) > 0 {
dueMap[jobID] = true // Reset next run before unlocking to prevent duplicate execution.
} dueMap := make(map[string]bool, len(dueJobIDs))
for i := range cs.store.Jobs { for _, jobID := range dueJobIDs {
if dueMap[cs.store.Jobs[i].ID] { dueMap[jobID] = true
cs.store.Jobs[i].State.NextRunAtMS = nil }
for i := range cs.store.Jobs {
if dueMap[cs.store.Jobs[i].ID] {
cs.store.Jobs[i].State.NextRunAtMS = nil
}
} }
}
if err := cs.saveStoreUnsafe(); err != nil { if err := cs.saveStoreUnsafe(); err != nil {
log.Printf("[cron] failed to save store: %v", err) log.Printf("[cron] failed to save store: %v", err)
}
} }
cs.mu.Unlock() cs.mu.Unlock()
@ -347,7 +359,13 @@ func (cs *CronService) loadStore() error {
return err return err
} }
return json.Unmarshal(data, cs.store) if err := json.Unmarshal(data, cs.store); err != nil {
return err
}
if info, err := os.Stat(cs.storePath); err == nil {
cs.fileModTime = info.ModTime()
}
return nil
} }
func (cs *CronService) saveStoreUnsafe() error { func (cs *CronService) saveStoreUnsafe() error {
@ -357,7 +375,13 @@ func (cs *CronService) saveStoreUnsafe() error {
} }
// Use unified atomic write utility with explicit sync for flash storage reliability. // Use unified atomic write utility with explicit sync for flash storage reliability.
return fileutil.WriteFileAtomic(cs.storePath, data, 0o600) if err := fileutil.WriteFileAtomic(cs.storePath, data, 0o600); err != nil {
return err
}
if info, err := os.Stat(cs.storePath); err == nil {
cs.fileModTime = info.ModTime()
}
return nil
} }
func (cs *CronService) AddJob( func (cs *CronService) AddJob(