fix: 手动触发全部成功时被误报为失败
trigger 接口的 fails 是 nil 切片,无失败时序列化成 JSON null, 前端读 failed.length 抛异常并落入 catch 分支,把成功显示成"触发失败"。 改为初始化空切片,前端同时加空值兜底。 顺带修复 logstore.trim 用 First 查询保留位置,日志未超出保留条数时 返回 ErrRecordNotFound,导致每写一条日志都刷一行 gorm 警告。 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -57,11 +57,14 @@ func HandleTriggerTimer(c *gin.Context) {
|
|||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
// 并发执行所有规则,收集失败信息
|
// 并发执行所有规则,收集失败信息
|
||||||
|
//
|
||||||
|
// fails 必须初始化为空切片:nil 切片会被序列化成 JSON null,
|
||||||
|
// 前端读 failed.length 时会抛异常,把全部成功误报成触发失败。
|
||||||
var (
|
var (
|
||||||
wg sync.WaitGroup
|
wg sync.WaitGroup
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
fails []string
|
|
||||||
)
|
)
|
||||||
|
fails := []string{}
|
||||||
for i := range rules {
|
for i := range rules {
|
||||||
rule := rules[i]
|
rule := rules[i]
|
||||||
wg.Add(1)
|
wg.Add(1)
|
||||||
|
|||||||
@@ -42,18 +42,23 @@ func trim(uid uint) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var cutoff model.ExecutionLog
|
// 用 Find 而不是 First:日志没超出保留条数是常态,
|
||||||
err = gormDB.Where("uid = ?", uid).
|
// First 找不到记录会返回 ErrRecordNotFound,每写一条日志都刷一行 gorm 警告。
|
||||||
|
var cutoff []model.ExecutionLog
|
||||||
|
if err := gormDB.Where("uid = ?", uid).
|
||||||
Order("id DESC").
|
Order("id DESC").
|
||||||
Offset(config.LogRetainCount).
|
Offset(config.LogRetainCount).
|
||||||
Limit(1).
|
Limit(1).
|
||||||
First(&cutoff).Error
|
Find(&cutoff).Error; err != nil {
|
||||||
if err != nil {
|
log.Printf("清理执行日志失败: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if len(cutoff) == 0 {
|
||||||
// 没有超出保留条数
|
// 没有超出保留条数
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := gormDB.Where("uid = ? AND id <= ?", uid, cutoff.ID).
|
if err := gormDB.Where("uid = ? AND id <= ?", uid, cutoff[0].ID).
|
||||||
Delete(&model.ExecutionLog{}).Error; err != nil {
|
Delete(&model.ExecutionLog{}).Error; err != nil {
|
||||||
log.Printf("清理执行日志失败: %v", err)
|
log.Printf("清理执行日志失败: %v", err)
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
@@ -147,12 +147,11 @@ async function trigger(timer: Timer) {
|
|||||||
triggeringId.value = timer.id
|
triggeringId.value = timer.id
|
||||||
try {
|
try {
|
||||||
const result = await timerApi.trigger(timer.id)
|
const result = await timerApi.trigger(timer.id)
|
||||||
if (result.failed.length === 0) {
|
const failed = result.failed ?? []
|
||||||
|
if (failed.length === 0) {
|
||||||
ElMessage.success(`已执行 ${result.total} 条规则,全部成功`)
|
ElMessage.success(`已执行 ${result.total} 条规则,全部成功`)
|
||||||
} else {
|
} else {
|
||||||
ElMessage.warning(
|
ElMessage.warning(`已执行 ${result.total} 条规则,${failed.length} 条失败,详情见执行日志`)
|
||||||
`已执行 ${result.total} 条规则,${result.failed.length} 条失败,详情见执行日志`,
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
ElMessage.error(error instanceof ApiError ? error.message : '触发失败')
|
ElMessage.error(error instanceof ApiError ? error.message : '触发失败')
|
||||||
|
|||||||
Reference in New Issue
Block a user