🚸 消除手动触发与自动触发的差异

This commit is contained in:
naiba
2021-11-28 10:05:07 +08:00
parent 8a3dfba19c
commit 0155e6e411
3 changed files with 8 additions and 20 deletions

View File

@@ -13,7 +13,7 @@ import (
pb "github.com/naiba/nezha/proto"
)
var Version = "v0.12.0" // !!记得修改 README 中的 badge 版本!!
var Version = "v0.12.1" // !!记得修改 README 中的 badge 版本!!
var (
Conf *model.Config
@@ -53,20 +53,8 @@ var CronLock sync.RWMutex
var Crons map[uint64]*model.Cron
var Cron *cron.Cron
func ManualTrigger(c *model.Cron) {
ServerLock.RLock()
defer ServerLock.RUnlock()
for j := 0; j < len(c.Servers); j++ {
if ServerList[c.Servers[j]].TaskStream != nil {
ServerList[c.Servers[j]].TaskStream.Send(&pb.Task{
Id: c.ID,
Data: c.Command,
Type: model.TaskTypeCommand,
})
} else {
SendNotification(fmt.Sprintf("[任务失败] %s服务器 %s 离线,无法执行。", c.Name, ServerList[c.Servers[j]].Name), false)
}
}
func ManualTrigger(c model.Cron) {
CronTrigger(c)()
}
func CronTrigger(cr model.Cron) func() {