Buriburizaemon/nezha_domains
1
0
Fork 0
mirror of https://github.com/Buriburizaem0n/nezha_domains.git synced 2026-02-04 04:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 修改计划任务并未取消旧任务

Browse Source
This commit is contained in:
naiba
2021-09-30 11:59:57 +08:00
parent 092f40b47f
commit a25a1b128d
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/dashboard/controller/member_api.go
View File

@@ -10,7 +10,6 @@ import (
"time"
"github.com/gin-gonic/gin"
"github.com/robfig/cron/v3"
"github.com/naiba/nezha/model"
"github.com/naiba/nezha/pkg/mygin"
@@ -82,8 +81,8 @@ func (ma *memberAPI) delete(c *gin.Context) {
dao.CronLock.RLock()
defer dao.CronLock.RUnlock()
cr := dao.Crons[id]
if cr != nil && cr.CronID != 0 {
dao.Cron.Remove(cr.CronID)
if cr != nil && cr.CronJobID != 0 {
dao.Cron.Remove(cr.CronJobID)
}
delete(dao.Crons, id)
}
@@ -276,7 +275,7 @@ func (ma *memberAPI) addOrEditCron(c *gin.Context) {
}
}
if err == nil {
cr.CronID, err = dao.Cron.AddFunc(cr.Scheduler, dao.CronTrigger(cr))
cr.CronJobID, err = dao.Cron.AddFunc(cr.Scheduler, dao.CronTrigger(cr))
}
if err == nil {
err = tx.Commit().Error
@@ -294,8 +293,8 @@ func (ma *memberAPI) addOrEditCron(c *gin.Context) {
dao.CronLock.Lock()
defer dao.CronLock.Unlock()
crOld := dao.Crons[cr.ID]
if crOld != nil && crOld.CronID != 0 {
dao.Cron.Remove(cron.EntryID(crOld.ID))
if crOld != nil && crOld.CronJobID != 0 {
dao.Cron.Remove(crOld.CronJobID)
}
delete(dao.Crons, cr.ID)

2
cmd/dashboard/main.go
View File

@@ -165,7 +165,7 @@ func loadCrons() {
crIgnoreMap[cr.Servers[j]] = true
}
cr.CronID, err = dao.Cron.AddFunc(cr.Scheduler, dao.CronTrigger(cr))
cr.CronJobID, err = dao.Cron.AddFunc(cr.Scheduler, dao.CronTrigger(cr))
if err == nil {
dao.Crons[cr.ID] = &cr
} else {