From 738f22d038c6759ceda72db52ae2a113f10fe846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AD=90=E9=BE=99?= <chenzilong@wodcloud.com>
Date: Fri, 7 Jul 2023 18:02:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E8=BF=90=E7=BB=B4?=
 =?UTF-8?q?=20=E7=AB=8B=E5=8D=B3=E6=89=A7=E8=A1=8C=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/service/task_manage.go | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/service/task_manage.go b/src/service/task_manage.go
index bcee7a8..dc36a66 100644
--- a/src/service/task_manage.go
+++ b/src/service/task_manage.go
@@ -263,7 +263,7 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (err error) {
 	outputBuf := bufio.NewReader(stdout)
 	readerr := bufio.NewReader(stderr)
 
-	var out, outErr, errFlag int
+	var out, outErr int
 	var execLog string
 	for {
 
@@ -286,7 +286,6 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (err error) {
 			outErr = 1
 		} else if outErr == 0 {
 			//存储异常执行日志
-			errFlag = 1
 			execLog = execLog + lineErr + " \n "
 			UpdateExecHistory(request.UpdateExecHistory{
 				TaskHistoryId: id,
@@ -295,25 +294,25 @@ func (t *TaskManageSvc) ExecScript(req request.ExecScriptReq) (err error) {
 		}
 
 		if out == 1 && outErr == 1 {
-			if errFlag == 1 {
-				//任务执行失败
-				UpdateExecHistory(request.UpdateExecHistory{
-					TaskHistoryId: id,
-					ExecLog:       execLog,
-					State:         2,
-				})
-			} else {
-				//任务执行成功
-				UpdateExecHistory(request.UpdateExecHistory{
-					TaskHistoryId: id,
-					ExecLog:       execLog,
-					State:         1,
-				})
-			}
 			break
 		}
 	}
 	cmd.Wait()
 
+	if cmd.ProcessState.Success() {
+		//任务执行成功
+		UpdateExecHistory(request.UpdateExecHistory{
+			TaskHistoryId: id,
+			ExecLog:       execLog,
+			State:         1,
+		})
+	} else {
+		//任务执行失败
+		UpdateExecHistory(request.UpdateExecHistory{
+			TaskHistoryId: id,
+			ExecLog:       execLog,
+			State:         2,
+		})
+	}
 	return
 }
-- 
2.26.0