From eee489e4de336d0b95ee274abe212926361b9e98 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Fri, 19 Aug 2022 16:53:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4GPU=E8=AE=AD=E7=BB=83?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=97=A5=E5=BF=97=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E3=80=82#2706?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index e4ed4a8b9..38409d505 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -391,9 +391,9 @@ func CloudbrainGetLog(ctx *context.Context) {
 		"JobID":          ID,
 		"LogFileName":    result["FileName"],
 		"StartLine":      startLine,
-		"EndLine":        startLine + lines,
+		"EndLine":        result["endLine"],
 		"Content":        result["Content"],
-		"Lines":          lines,
+		"Lines":          result["lines"],
 		"CanLogDownload": result["Content"] != "",
 	}
 	//result := CloudbrainGetLogByJobId(job.JobID, job.JobName)
@@ -411,6 +411,8 @@ func GetLogFromModelDir(jobName string, startLine int, endLine int) map[string]i
 
 	re := ""
 	fileName := ""
+	count := 0
+	fileEndLine := endLine
 	for _, file := range files {
 		if strings.HasSuffix(file.FileName, "log.txt") {
 			fileName = file.FileName
@@ -420,7 +422,7 @@ func GetLogFromModelDir(jobName string, startLine int, endLine int) map[string]i
 			defer reader.Close()
 			if err == nil {
 				r := bufio.NewReader(reader)
-				for i := 0; i < endLine; i++ {
+				for i := 0; i <= endLine; i++ {
 					line, error := r.ReadString('\n')
 					log.Info("line=" + line)
 					if error == io.EOF {
@@ -431,9 +433,11 @@ func GetLogFromModelDir(jobName string, startLine int, endLine int) map[string]i
 						log.Info("read file error." + error.Error())
 						break
 					}
+					fileEndLine = i
 					if error == nil {
 						if i >= startLine {
 							re = re + line
+							count++
 						}
 					}
 				}
@@ -448,6 +452,8 @@ func GetLogFromModelDir(jobName string, startLine int, endLine int) map[string]i
 		"JobName":  jobName,
 		"Content":  re,
 		"FileName": fileName,
+		"lines":    count,
+		"endLine":  fileEndLine,
 	}
 }