fix: different cronexpr rules between ui and pocketbase

This commit is contained in:
Fu Diwei
2025-02-10 09:59:03 +08:00
parent a74ec95a6a
commit b8513eb0b6
10 changed files with 35 additions and 21 deletions

View File

@@ -92,6 +92,7 @@ func (w *WorkflowDispatcher) Dispatch(data *WorkflowWorkerData) {
}
w.enqueueWorker(data)
select {
case w.chWork <- data:
default:
@@ -138,6 +139,11 @@ func (w *WorkflowDispatcher) Shutdown() {
w.queueMutex.Unlock()
// 等待所有正在执行的 WorkflowRun 完成
w.workerMutex.Lock()
for _, worker := range w.workers {
worker.Cancel()
}
w.workerMutex.Unlock()
w.wg.Wait()
w.workers = make(map[string]*workflowWorker)
w.workerIdMap = make(map[string]string)

View File

@@ -72,7 +72,6 @@ func onWorkflowRecordCreateOrUpdate(ctx context.Context, record *core.Record) er
})
})
if err != nil {
app.GetLogger().Error("add cron job failed", "err", err)
return fmt.Errorf("add cron job failed: %w", err)
}

View File

@@ -48,6 +48,8 @@ func (s *WorkflowService) InitSchedule(ctx context.Context) error {
scheduler := app.GetScheduler()
for _, workflow := range workflows {
var errs []error
err := scheduler.Add(fmt.Sprintf("workflow#%s", workflow.Id), workflow.TriggerCron, func() {
s.StartRun(ctx, &dtos.WorkflowStartRunReq{
WorkflowId: workflow.Id,
@@ -55,7 +57,11 @@ func (s *WorkflowService) InitSchedule(ctx context.Context) error {
})
})
if err != nil {
return err
errs = append(errs, err)
}
if len(errs) > 0 {
return errors.Join(errs...)
}
}