From 79297a26f743c36215f8476c350dca6d72a6e842 Mon Sep 17 00:00:00 2001
From: Boming Zhang <bomingzh@sjtu.edu.cn>
Date: Fri, 15 Nov 2024 03:17:17 -0500
Subject: [PATCH] chore: log force quit stage name

---
 cmd/joj3/main.go      | 13 +++++++------
 cmd/joj3/stage/run.go |  8 ++++----
 internal/stage/run.go | 11 ++++++-----
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/cmd/joj3/main.go b/cmd/joj3/main.go
index 1c2f8f6..ced57e4 100644
--- a/cmd/joj3/main.go
+++ b/cmd/joj3/main.go
@@ -35,7 +35,7 @@ func init() {
 func mainImpl() (err error) {
 	confObj := new(conf.Conf)
 	var stageResults []internalStage.StageResult
-	var stageForceQuit bool
+	var forceQuitStageName string
 	var teapotResult teapot.TeapotResult
 	defer func() {
 		actor := os.Getenv("GITHUB_ACTOR")
@@ -52,7 +52,8 @@ func mainImpl() (err error) {
 			"joj3 summary",
 			"name", confObj.Name,
 			"totalScore", totalScore,
-			"forceQuit", stageForceQuit,
+			"forceQuit", forceQuitStageName != "",
+			"forceQuitStageName", forceQuitStageName,
 			"actor", actor,
 			"repository", repository,
 			"ref", ref,
@@ -110,7 +111,7 @@ func mainImpl() (err error) {
 		return err
 	}
 	groups := conf.MatchGroups(confObj, conventionalCommit)
-	stageResults, stageForceQuit, err = stage.Run(confObj, groups)
+	stageResults, forceQuitStageName, err = stage.Run(confObj, groups)
 	if err != nil {
 		slog.Error("stage run", "error", err)
 	}
@@ -123,9 +124,9 @@ func mainImpl() (err error) {
 		slog.Error("teapot run", "error", err)
 		return err
 	}
-	if stageForceQuit {
-		slog.Info("stage force quit")
-		return fmt.Errorf("stage force quit")
+	if forceQuitStageName != "" {
+		slog.Info("stage force quit", "name", forceQuitStageName)
+		return fmt.Errorf("stage force quit with name %s", forceQuitStageName)
 	}
 	return nil
 }
diff --git a/cmd/joj3/stage/run.go b/cmd/joj3/stage/run.go
index e4cf1e1..4883dc6 100644
--- a/cmd/joj3/stage/run.go
+++ b/cmd/joj3/stage/run.go
@@ -132,7 +132,7 @@ func newErrorStageResults(err error) []stage.StageResult {
 }
 
 func Run(conf *conf.Conf, groups []string) (
-	stageResults []stage.StageResult, forceQuit bool, err error,
+	stageResults []stage.StageResult, forceQuitStageName string, err error,
 ) {
 	executors.InitWithConf(
 		conf.Stage.SandboxExecServer,
@@ -142,15 +142,15 @@ func Run(conf *conf.Conf, groups []string) (
 	if err != nil {
 		slog.Error("generate stages", "error", err)
 		stageResults = newErrorStageResults(err)
-		forceQuit = true
+		forceQuitStageName = "internal"
 		return
 	}
 	defer stage.Cleanup()
-	stageResults, forceQuit, err = stage.Run(stages)
+	stageResults, forceQuitStageName, err = stage.Run(stages)
 	if err != nil {
 		slog.Error("run stages", "error", err)
 		stageResults = newErrorStageResults(err)
-		forceQuit = true
+		forceQuitStageName = "internal"
 		return
 	}
 	return
diff --git a/internal/stage/run.go b/internal/stage/run.go
index 8c0f30d..d4a910c 100644
--- a/internal/stage/run.go
+++ b/internal/stage/run.go
@@ -5,7 +5,9 @@ import (
 	"log/slog"
 )
 
-func Run(stages []Stage) (stageResults []StageResult, forceQuit bool, err error) {
+func Run(stages []Stage) (
+	stageResults []StageResult, forceQuitStageName string, err error,
+) {
 	var executorResults []ExecutorResult
 	var parserResults []ParserResult
 	var tmpParserResults []ParserResult
@@ -59,7 +61,6 @@ func Run(stages []Stage) (stageResults []StageResult, forceQuit bool, err error)
 			"summary", SummarizeExecutorResults(executorResults),
 		)
 		parserResults = []ParserResult{}
-		forceQuit = false
 		for _, stageParser := range stage.Parsers {
 			slog.Info(
 				"parser run start",
@@ -100,8 +101,8 @@ func Run(stages []Stage) (stageResults []StageResult, forceQuit bool, err error)
 					"stageName", stage.Name,
 					"name", stageParser.Name,
 				)
+				forceQuitStageName = stage.Name
 			}
-			forceQuit = forceQuit || parserForceQuit
 			slog.Debug(
 				"parser run done",
 				"stageName", stage.Name,
@@ -120,9 +121,9 @@ func Run(stages []Stage) (stageResults []StageResult, forceQuit bool, err error)
 		stageResults = append(stageResults, StageResult{
 			Name:      stage.Name,
 			Results:   parserResults,
-			ForceQuit: forceQuit,
+			ForceQuit: forceQuitStageName != "",
 		})
-		if forceQuit {
+		if forceQuitStageName != "" {
 			break
 		}
 	}