Compare commits

..

No commits in common. "master" and "v2.0.1" have entirely different histories.

View File

@ -194,14 +194,12 @@ func (cron *Crontab) FromString(crontab string) error {
// "f1-2|5-10x5,f1|10m,10-15,f1" // "f1-2|5-10x5,f1|10m,10-15,f1"
cron.lastStatus = true cron.lastStatus = true
cron.isCalculated = true cron.isCalculated = false
cron.nextTime = time.Now()
cron.interval = clinked.NewCircularLinked() cron.interval = clinked.NewCircularLinked()
var intervalList []interface{} var intervalList []interface{}
intervalList = parseIntervalString(matches[0]) intervalList = parseIntervalString(matches[0])
cron.interval.Append(intervalList...) cron.interval.Append(intervalList...)
cron.TimeUp()
case 5: case 5:
cron.min = createTimePointer(matches[0], 0, 59, true) cron.min = createTimePointer(matches[0], 0, 59, true)
cron.hour = createTimePointer(matches[1], 0, 23, true) cron.hour = createTimePointer(matches[1], 0, 23, true)
@ -339,7 +337,7 @@ func (cron *Crontab) intervalCalculateNextTime(now time.Time) {
func (cron *Crontab) intervalTimeUp() bool { func (cron *Crontab) intervalTimeUp() bool {
if cron.isCalculated { // 需要调用nexttime()才能正常正常计算下次的时间 if cron.isCalculated != false {
now := time.Now() now := time.Now()
if now.Unix() >= cron.nextTime.Unix() { if now.Unix() >= cron.nextTime.Unix() {
cron.isCalculated = false cron.isCalculated = false