JOJ/JOJ3
25
6
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(cmd/joj3)!: conf #51

Merged
张泊明518370910136 merged 11 commits from conf into master 2024-10-12 13:21:59 +08:00
Conversation 0 Commits 11 Files Changed 6 +4 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4eb030a6d6 - Show all commits

7
internal/stage/run.go
View File

@ -32,6 +32,7 @@ func Run(stages []Stage) (stageResults []StageResult, err error) {
slog.Debug("executor run done", "result.Files", executorResult.Files) slog.Debug("executor run done", "result.Files", executorResult.Files)
} }
parserResults = []ParserResult{} parserResults = []ParserResult{}
stageForceQuit := false
for _, stageParser := range stage.Parsers { for _, stageParser := range stage.Parsers {
slog.Info("parser run start", "name", stageParser.Name) slog.Info("parser run start", "name", stageParser.Name)
slog.Debug("parser run start", "name", stageParser.Name, slog.Debug("parser run start", "name", stageParser.Name,
@ -48,6 +49,7 @@ func Run(stages []Stage) (stageResults []StageResult, err error) {
slog.Error("parser run error", "name", stageParser.Name, "error", err) slog.Error("parser run error", "name", stageParser.Name, "error", err)
return return
} }
stageForceQuit = stageForceQuit || forceQuit
slog.Debug("parser run done", "results", tmpParserResults) slog.Debug("parser run done", "results", tmpParserResults)
if len(parserResults) == 0 { if len(parserResults) == 0 {
parserResults = tmpParserResults parserResults = tmpParserResults
@ -59,15 +61,14 @@ func Run(stages []Stage) (stageResults []StageResult, err error) {
} }
if forceQuit { if forceQuit {
slog.Error("parser force quit", "name", stageParser.Name) slog.Error("parser force quit", "name", stageParser.Name)
break
} }
} }
stageResults = append(stageResults, StageResult{ stageResults = append(stageResults, StageResult{
Name: stage.Name, Name: stage.Name,
Results: parserResults, Results: parserResults,
ForceQuit: forceQuit, ForceQuit: stageForceQuit,
}) })
if forceQuit { if stageForceQuit {
break break
} }
} }