🔥 移除后台登录类型设置,增加调度失败计划任务提醒

This commit is contained in:
naiba
2021-09-30 00:01:04 +08:00
parent 8af9b1ab18
commit 092f40b47f
8 changed files with 22 additions and 20 deletions

View File

@@ -457,7 +457,6 @@ type settingForm struct {
ViewPassword string
EnableIPChangeNotification string
IgnoredIPNotification string
Oauth2Type string
GRPCHost string
Cover uint8
}
@@ -479,7 +478,6 @@ func (ma *memberAPI) updateSetting(c *gin.Context) {
dao.Conf.Site.Theme = sf.Theme
dao.Conf.Site.CustomCode = sf.CustomCode
dao.Conf.Site.ViewPassword = sf.ViewPassword
dao.Conf.Oauth2.Type = sf.Oauth2Type
dao.Conf.Oauth2.Admin = sf.Admin
if err := dao.Conf.Save(); err != nil {
c.JSON(http.StatusOK, model.Response{

View File

@@ -1,7 +1,9 @@
package main
import (
"bytes"
"context"
"fmt"
"log"
"time"
@@ -56,6 +58,7 @@ func initSystem() {
model.Notification{}, model.AlertRule{}, model.Monitor{},
model.MonitorHistory{}, model.Cron{}, model.Transfer{})
dao.LoadNotifications()
loadServers() //加载服务器列表
loadCrons() //加载计划任务
@@ -153,6 +156,7 @@ func loadCrons() {
var crons []model.Cron
dao.DB.Find(&crons)
var err error
errMsg := new(bytes.Buffer)
for i := 0; i < len(crons); i++ {
cr := crons[i]
@@ -165,9 +169,16 @@ func loadCrons() {
if err == nil {
dao.Crons[cr.ID] = &cr
} else {
log.Println("NEZHA>> 计划任务调度失败", cr, err)
if errMsg.Len() == 0 {
errMsg.WriteString("调度失败的计划任务:[")
}
errMsg.WriteString(fmt.Sprintf("%d,", cr.ID))
}
}
if errMsg.Len() > 0 {
msg := errMsg.String()
dao.SendNotification(msg[:len(msg)-1]+"] 这些任务将无法正常执行,请进入后点重新修改保存。", false)
}
dao.Cron.Start()
}