From 2b236089118f7475a0fc1367c60f284e17d11e71 Mon Sep 17 00:00:00 2001
From: feiguoL <feig.work@gmail.com>
Date: Fri, 5 Jul 2024 16:26:49 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Aadd=20log=20print=20function=20wit?=
 =?UTF-8?q?h=20exit=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ass log ptint func

Log:
Change-Id: I46cb977e39e8c00b794376c70a88384bd555e223
---
 Makefile           |   2 +-
 app/cmd/job_log.go | 102 +++++++++++++++++++++++++++++----------------
 2 files changed, 68 insertions(+), 36 deletions(-)

diff --git a/Makefile b/Makefile
index 1ea2c1e4..379559db 100644
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,7 @@ gen-data-darwin: go-bindata-download-darwin
 
 verify: dep tools lint
 
-pre-build: fmt vet
+pre-build:
 	export GO111MODULE=on
 	export GOPROXY=https://goproxy.io
 	go mod tidy
diff --git a/app/cmd/job_log.go b/app/cmd/job_log.go
index f02ab69f..dc69f7a1 100644
--- a/app/cmd/job_log.go
+++ b/app/cmd/job_log.go
@@ -21,22 +21,31 @@ type JobLogOption struct {
 	LastBuildID   int
 	LastBuildURL  string
 	NumberOfLines int
+	ExitCode      bool
 
 	RoundTripper http.RoundTripper
 }
 
 var jobLogOption JobLogOption
 
+const (
+	LogFinishMsg     = "finish end the job logs"
+	JobResultSuccess = "SUCCESS"
+	JobResultFailed  = "FAILURE"
+)
+
 func init() {
 	jobCmd.AddCommand(jobLogCmd)
 	jobLogCmd.Flags().IntVarP(&jobLogOption.History, "history", "s", -1,
 		i18n.T("Specific build history of log"))
 	jobLogCmd.Flags().BoolVarP(&jobLogOption.Watch, "watch", "w", false,
 		i18n.T("Watch the job logs"))
-	jobLogCmd.Flags().IntVarP(&jobLogOption.Interval, "interval", "i", 1,
-		i18n.T("Interval of watch"))
+	jobLogCmd.Flags().IntVarP(&jobLogOption.Interval, "interval", "i", 10,
+		i18n.T("Interval of watch seconds"))
 	jobLogCmd.Flags().IntVarP(&jobLogOption.NumberOfLines, "tail", "t", -1,
 		i18n.T("The last number of lines of the log"))
+	jobLogCmd.Flags().BoolVarP(&jobLogOption.ExitCode, "exit-code", "e", false,
+		i18n.T("Watch the job logs with job state, failed exit 1"))
 }
 
 var jobLogCmd = &cobra.Command{
@@ -48,6 +57,7 @@ It'll print the log text of the last build if you don't give the build id.`),
 	Example: `jcli job log <jobName> [buildID]
 jcli job log <jobName> --history 1
 jcli job log <jobName> --watch
+jcli job log <jobName> --watch --exit-code
 jcli job log <jobName> --tail <numberOfLines>`,
 	PreRunE: func(_ *cobra.Command, args []string) (err error) {
 		if len(args) >= 3 && jobLogOption.History == -1 {
@@ -62,39 +72,9 @@ jcli job log <jobName> --tail <numberOfLines>`,
 		return
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		name := args[0]
-
-		jclient := &client.JobClient{
-			JenkinsCore: client.JenkinsCore{
-				RoundTripper: jobLogOption.RoundTripper,
-			},
-		}
-		getCurrentJenkinsAndClientOrDie(&(jclient.JenkinsCore))
-
-		lastBuildID := -1
-		var jobBuild *client.JobBuild
-		var err error
-		for {
-			if jobBuild, err = jclient.GetBuild(name, jobLogOption.History); err == nil {
-				jobLogOption.LastBuildID = jobBuild.Number
-				jobLogOption.LastBuildURL = jobBuild.URL
-			} else {
-				break
-			}
-
-			if lastBuildID != jobLogOption.LastBuildID {
-				lastBuildID = jobLogOption.LastBuildID
-				cmd.Println("Current build number:", jobLogOption.LastBuildID)
-				cmd.Println("Current build url:", jobLogOption.LastBuildURL)
-
-				err = printLog(jclient, cmd, name, jobLogOption.History, 0, jobLogOption.NumberOfLines)
-			}
-
-			if err != nil || !jobLogOption.Watch {
-				break
-			}
-
-			time.Sleep(time.Duration(jobLogOption.Interval) * time.Second)
+		err := printLogRunFunc(args[0], jobLogOption, cmd)
+		if err != nil {
+			logger.Sugar().Infof("[ERR] print log func error %v", err.Error())
 		}
 	},
 }
@@ -133,7 +113,59 @@ func printLog(jclient *client.JobClient, cmd *cobra.Command, jobName string, his
 
 		if jobLog.HasMore {
 			err = printLog(jclient, cmd, jobName, history, jobLog.NextStart, numberOfLines)
+		} else {
+			err = fmt.Errorf(LogFinishMsg)
 		}
 	}
 	return
 }
+
+func printLogRunFunc(jobName string, jobLogOption JobLogOption, cmd *cobra.Command) (err error) {
+	name := jobName
+
+	jclient := &client.JobClient{
+		JenkinsCore: client.JenkinsCore{
+			RoundTripper: jobLogOption.RoundTripper,
+		},
+	}
+	getCurrentJenkinsAndClientOrDie(&(jclient.JenkinsCore))
+
+	lastBuildID := -1
+	var jobBuild *client.JobBuild
+	for {
+		if jobBuild, err = jclient.GetBuild(name, jobLogOption.History); err == nil {
+			jobLogOption.LastBuildID = jobBuild.Number
+			jobLogOption.LastBuildURL = jobBuild.URL
+		} else {
+			logger.Sugar().Fatal("[ERR] get job build info failed...")
+		}
+
+		if lastBuildID != jobLogOption.LastBuildID {
+			lastBuildID = jobLogOption.LastBuildID
+			cmd.Println("Current build number:", jobLogOption.LastBuildID)
+			cmd.Println("Current build url:", jobLogOption.LastBuildURL)
+
+			err = printLog(jclient, cmd, name, jobLogOption.History, 0, jobLogOption.NumberOfLines)
+		}
+
+		if err != nil || !jobLogOption.Watch {
+			if err.Error() == LogFinishMsg {
+				err = nil
+				cmd.Println("[INFO] current log finish output")
+				if jobLogOption.ExitCode {
+					if jobBuild, err = jclient.GetBuild(name, jobLogOption.History); err == nil {
+						if jobBuild.Result == JobResultFailed {
+							logger.Sugar().Fatalf("[ERR] job build %v end with build state failed [%vconsole], exit...", jobLogOption.LastBuildID, jobLogOption.LastBuildURL)
+						}
+					} else {
+						logger.Sugar().Fatal("[ERR] get job build info failed...")
+					}
+				}
+			}
+			break
+		}
+
+		time.Sleep(time.Duration(jobLogOption.Interval) * time.Second)
+	}
+	return
+}