fix: 修正轮询配置多匹配逻辑,支持同卡匹配多个配置并按 priority 合并 interval
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 7m27s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 7m27s
核心变更: - MatchConfig 改为 MatchConfigs,返回所有匹配配置 - MergedTaskIntervals 按 task type 合并各配置,选取最高优先级(非 nil 且最小 priority 值) - hasAnyEnabledInterval 过滤所有 interval 均为 NULL 的配置 - calcInitialDelay 重构为纯函数,接收 interval 参数 - 移除 getEnabledTaskTypes 和 getIntervalByTaskType(被 MergedTaskIntervals 替代) - scheduler.go 新增心跳 key + 顶层 panic recovery + Init 完成守卫 - initializer.go 批量失败日志升级为 Error,逐条检查 Pipeline 命令错误 - 数据迁移:禁用 id=29 的轮询配置(所有 interval 均为 NULL) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
5
migrations/000125_disable_polling_config_id29.down.sql
Normal file
5
migrations/000125_disable_polling_config_id29.down.sql
Normal file
@@ -0,0 +1,5 @@
|
||||
-- 回滚:重新启用 id=29 的轮询配置
|
||||
UPDATE tb_polling_config
|
||||
SET status = 1
|
||||
WHERE id = 29
|
||||
AND status = 0;
|
||||
7
migrations/000125_disable_polling_config_id29.up.sql
Normal file
7
migrations/000125_disable_polling_config_id29.up.sql
Normal file
@@ -0,0 +1,7 @@
|
||||
-- 禁用 id=29 的轮询配置(所有 interval 均为 NULL,导致轮询系统失效)
|
||||
-- 该配置 priority=1 会匹配所有卡,但其所有 interval 字段全为 NULL,
|
||||
-- 在多匹配语义下会"吞噬"更具体配置的有效 interval,导致轮询系统失效
|
||||
UPDATE tb_polling_config
|
||||
SET status = 0
|
||||
WHERE id = 29
|
||||
AND status = 1;
|
||||
Reference in New Issue
Block a user