Merge pull request 'fix-3480' (#3539) from fix-3339 into V20221228

Reviewed-on: https://openi.pcl.ac.cn/OpenI/aiforge/pulls/3539
Reviewed-by: zouap <zouap@pcl.ac.cn>

routers/repo/grampus.go

@@ -1377,9 +1377,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":        "",
@@ -1387,20 +1387,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
 		}
 	}