Merge fix/cron-file-integrity: reload store on external file change; only save when state changes
This commit is contained in:
commit
c257e3ff59
1 changed files with 44 additions and 20 deletions
|
|
@ -66,6 +66,7 @@ type CronService struct {
|
||||||
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,7 +159,10 @@ 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
|
||||||
|
// concurrent writes from the CLI or other processes.
|
||||||
|
if len(dueJobIDs) > 0 {
|
||||||
|
// Reset next run before unlocking to prevent duplicate execution.
|
||||||
dueMap := make(map[string]bool, len(dueJobIDs))
|
dueMap := make(map[string]bool, len(dueJobIDs))
|
||||||
for _, jobID := range dueJobIDs {
|
for _, jobID := range dueJobIDs {
|
||||||
dueMap[jobID] = true
|
dueMap[jobID] = true
|
||||||
|
|
@ -165,6 +176,7 @@ func (cs *CronService) checkJobs() {
|
||||||
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(
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue