eson/crontabex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整正确的统计让第一次直接执行

Browse Source
This commit is contained in:
huangsimin 2019-01-04 18:24:41 +08:00
parent 7342ef6605
commit 0f83cb5e66
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crontab.go
View File

@ -185,12 +185,14 @@ 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 = false cron.isCalculated = true
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)
@ -328,7 +330,7 @@ func (cron *Crontab) intervalCalculateNextTime(now time.Time) {
func (cron *Crontab) intervalTimeUp() bool { func (cron *Crontab) intervalTimeUp() bool {
if cron.isCalculated != false { if cron.isCalculated { // 需要调用nexttime()才能正常正常计算下次的时间
now := time.Now() now := time.Now()
if now.Unix() >= cron.nextTime.Unix() { if now.Unix() >= cron.nextTime.Unix() {
cron.isCalculated = false cron.isCalculated = false