|
|
@@ -165,11 +165,11 @@ func (c *Cron) runWithRecovery(j Job) {
|
|
|
j.Run()
|
|
|
}
|
|
|
|
|
|
-// Run the scheduler.. this is private just due to the need to synchronize
|
|
|
+// Run the scheduler. this is private just due to the need to synchronize
|
|
|
// access to the 'running' state variable.
|
|
|
func (c *Cron) run() {
|
|
|
// Figure out the next activation times for each entry.
|
|
|
- now := time.Now().In(c.location)
|
|
|
+ now := c.now()
|
|
|
for _, entry := range c.entries {
|
|
|
entry.Next = entry.Schedule.Next(now)
|
|
|
}
|
|
|
@@ -178,22 +178,21 @@ func (c *Cron) run() {
|
|
|
// Determine the next entry to run.
|
|
|
sort.Sort(byTime(c.entries))
|
|
|
|
|
|
- var effective time.Time
|
|
|
+ var timer *time.Timer
|
|
|
if len(c.entries) == 0 || c.entries[0].Next.IsZero() {
|
|
|
// If there are no entries yet, just sleep - it still handles new entries
|
|
|
// and stop requests.
|
|
|
- effective = now.AddDate(10, 0, 0)
|
|
|
+ timer = time.NewTimer(100000 * time.Hour)
|
|
|
} else {
|
|
|
- effective = c.entries[0].Next
|
|
|
+ timer = time.NewTimer(c.entries[0].Next.Sub(now))
|
|
|
}
|
|
|
|
|
|
- timer := time.NewTimer(effective.Sub(now))
|
|
|
select {
|
|
|
case now = <-timer.C:
|
|
|
now = now.In(c.location)
|
|
|
- // Run every entry whose next time was this effective time.
|
|
|
+ // Run every entry whose next time was less than now
|
|
|
for _, e := range c.entries {
|
|
|
- if e.Next != effective {
|
|
|
+ if e.Next.After(now) || e.Next.IsZero() {
|
|
|
break
|
|
|
}
|
|
|
go c.runWithRecovery(e.Job)
|
|
|
@@ -251,3 +250,8 @@ func (c *Cron) entrySnapshot() []*Entry {
|
|
|
}
|
|
|
return entries
|
|
|
}
|
|
|
+
|
|
|
+// now returns current time in c location
|
|
|
+func (c *Cron) now() time.Time {
|
|
|
+ return time.Now().In(c.location)
|
|
|
+}
|