调整task工厂
This commit is contained in:
@@ -83,7 +83,6 @@ type Scheduler struct {
|
||||
planRepo repository.PlanRepository
|
||||
analysisPlanTaskManager *AnalysisPlanTaskManager // <--- 注入共享的 Manager
|
||||
progressTracker *ProgressTracker
|
||||
taskFactory func(taskType models.TaskType) Task // 调度器需要注入一个任务工厂,用于创建任务实例
|
||||
|
||||
pool *ants.Pool // 使用 ants 协程池来管理并发
|
||||
wg sync.WaitGroup
|
||||
@@ -96,7 +95,6 @@ func NewScheduler(
|
||||
executionLogRepo repository.ExecutionLogRepository,
|
||||
planRepo repository.PlanRepository,
|
||||
analysisPlanTaskManager *AnalysisPlanTaskManager, // <--- 注入 Manager
|
||||
taskFactory func(taskType models.TaskType) Task,
|
||||
logger *logs.Logger,
|
||||
interval time.Duration,
|
||||
numWorkers int) *Scheduler {
|
||||
@@ -109,7 +107,6 @@ func NewScheduler(
|
||||
pollingInterval: interval,
|
||||
workers: numWorkers,
|
||||
progressTracker: NewProgressTracker(),
|
||||
taskFactory: taskFactory,
|
||||
stopChan: make(chan struct{}), // 初始化停止信号通道
|
||||
}
|
||||
}
|
||||
@@ -266,15 +263,12 @@ func (s *Scheduler) runTask(claimedLog *models.TaskExecutionLog) error {
|
||||
// 执行普通任务
|
||||
task := s.taskFactory(claimedLog.Task.Type)
|
||||
if err := task.ParseParams(s.logger, claimedLog); err != nil {
|
||||
|
||||
s.logger.Errorf("[严重] 任务参数解析失败, 日志ID: %d, 错误: %v", claimedLog.ID, err)
|
||||
return err
|
||||
}
|
||||
|
||||
if err := task.Execute(); err != nil {
|
||||
|
||||
s.logger.Errorf("[严重] 任务执行失败, 日志ID: %d, 错误: %v", claimedLog.ID, err)
|
||||
|
||||
task.OnFailure(err)
|
||||
return err
|
||||
}
|
||||
@@ -283,6 +277,17 @@ func (s *Scheduler) runTask(claimedLog *models.TaskExecutionLog) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// taskFactory 会根据任务类型初始化对应任务
|
||||
func (s *Scheduler) taskFactory(taskType models.TaskType) Task {
|
||||
switch taskType {
|
||||
case models.TaskTypeWaiting:
|
||||
return NewDelayTask()
|
||||
default:
|
||||
// TODO 这里直接panic合适吗? 不过这个场景确实不该出现任何异常的任务类型
|
||||
panic("不支持的任务类型")
|
||||
}
|
||||
}
|
||||
|
||||
// analysisPlan 解析Plan并将解析出的Task列表插入待执行队列中
|
||||
func (s *Scheduler) analysisPlan(claimedLog *models.TaskExecutionLog) error {
|
||||
// 创建Plan执行记录
|
||||
|
||||
Reference in New Issue
Block a user