From 25ba6c092e488d655c30edbad918a0d6ea833207 Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Thu, 12 Jan 2023 17:47:16 +0800
Subject: [PATCH] fix-3480

---
 routers/repo/grampus.go | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/routers/repo/grampus.go b/routers/repo/grampus.go
index d33fce106..9c204aff2 100755
--- a/routers/repo/grampus.go
+++ b/routers/repo/grampus.go
@@ -1308,7 +1308,7 @@ func GrampusTrainJobShow(ctx *context.Context) {
 	taskList := make([]*models.Cloudbrain, 0)
 	taskList = append(taskList, task)
 	prepareSpec4Show(ctx, task)
-	
+
 	ctx.Data["version_list_task"] = taskList
 	ctx.Data["datasetDownload"] = GetCloudBrainDataSetInfo(task.Uuid, task.DatasetName, false)
 	ctx.Data["canDownload"] = cloudbrain.CanModifyJob(ctx, task)
@@ -1349,9 +1349,9 @@ func GrampusGetLog(ctx *context.Context) {
 		return
 	}
 
-	content, err := grampus.GetTrainJobLog(job.JobID)
+	result, err := grampus.GetJob(jobID)
 	if err != nil {
-		log.Error("GetTrainJobLog failed: %v", err, ctx.Data["MsgID"])
+		log.Error("GetJob(%s) failed:%v", job.JobName, err)
 		ctx.JSON(http.StatusOK, map[string]interface{}{
 			"JobName":        job.JobName,
 			"Content":        "",
@@ -1359,20 +1359,26 @@ func GrampusGetLog(ctx *context.Context) {
 		})
 		return
 	}
-	result, err := grampus.GetJob(jobID)
+	exitDiagnostics := ""
+	if result != nil {
+		exitDiagnostics = result.ExitDiagnostics
+	}
+
+	content, err := grampus.GetTrainJobLog(job.JobID)
 	if err != nil {
-		log.Error("GetJob(%s) failed:%v", job.JobName, err)
+		log.Error("GetTrainJobLog failed: %v", err, ctx.Data["MsgID"])
 		ctx.JSON(http.StatusOK, map[string]interface{}{
 			"JobName":        job.JobName,
-			"Content":        content,
+			"Content":        exitDiagnostics,
 			"CanLogDownload": false,
 		})
 		return
 	}
+
 	if result != nil {
 		job.Status = grampus.TransTrainJobStatus(result.JobInfo.Status)
 		if job.Status == models.GrampusStatusFailed {
-			content = content + "\n" + result.ExitDiagnostics
+			content = content + "\n" + exitDiagnostics
 		}
 	}