修复cron定时器触发问题

This commit is contained in:
orgin
2022-03-09 11:24:46 +08:00
parent 93be70877b
commit 484e505ea4

View File

@@ -190,6 +190,7 @@ func (t *Timer) GetName() string{
} }
var emptyTimer Timer var emptyTimer Timer
func (t *Timer) Reset() { func (t *Timer) Reset() {
*t = emptyTimer *t = emptyTimer
} }
@@ -237,7 +238,7 @@ func (c *Cron) Do() {
if c.cb != nil { if c.cb != nil {
c.cb(c.Id, c.AdditionData) c.cb(c.Id, c.AdditionData)
}else if c.cbEx !=nil { } else if c.cbCronEx != nil {
c.cbCronEx(c) c.cbCronEx(c)
} }
@@ -352,7 +353,7 @@ func (dispatcher *Dispatcher) CronFunc(cronExpr *CronExpr,cb func(uint64,interfa
cron.cronExpr = cronExpr cron.cronExpr = cronExpr
cron.C = dispatcher.ChanTimer cron.C = dispatcher.ChanTimer
cron.interval = nextTime.Sub(now) cron.interval = nextTime.Sub(now)
cron.fireTime = Now().Add(cron.interval) cron.fireTime = nextTime
SetupTimer(cron) SetupTimer(cron)
onAddTimer(cron) onAddTimer(cron)
return cron return cron