From 7040539b004de6e4d5cf0b8ddab128780ddbc313 Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Wed, 19 Jan 2022 14:37:35 +0800
Subject: [PATCH] get log

---
 routers/api/v1/repo/cloudbrain.go | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 1b5ddf20f..2236c9013 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -8,6 +8,7 @@ package repo
 import (
 	"code.gitea.io/gitea/modules/log"
 	"net/http"
+	"sort"
 	"time"
 
 	"code.gitea.io/gitea/models"
@@ -96,7 +97,7 @@ func CloudbrainGetLog(ctx *context.Context) {
 	jobID := ctx.Params(":jobid")
 	_, err := models.GetCloudbrainByJobID(jobID)
 	if err != nil {
-		log.Error("GetCloudbrainByJobID failed: %v", err, ctx.Data["msgID"])
+		log.Error("GetCloudbrainByJobID failed: %v", err, ctx.Data["MsgID"])
 		ctx.ServerError(err.Error(), err)
 		return
 	}
@@ -104,12 +105,25 @@ func CloudbrainGetLog(ctx *context.Context) {
 	result, err := cloudbrain.GetJobLog(jobID)
 	if err != nil{
 		log.Error("GetJobLog failed: %v", err, ctx.Data["MsgID"])
+		ctx.ServerError(err.Error(), err)
 		return
 	}
 
+	sort.Slice(result.Hits.Hits, func(i, j int) bool {
+		return result.Hits.Hits[i].Sort[0] < result.Hits.Hits[j].Sort[0]
+	})
+
+	log.Info("%v", result.Hits.Hits)
+	var content []string
+	for _, log := range result.Hits.Hits {
+		content = append(content, log.Source.Message + "\n")
+	}
+
+	log.Info("%v", content)
+
 	ctx.JSON(http.StatusOK, map[string]interface{}{
 		"JobID":       jobID,
-		"Content":     result.Hits,
+		"Content":     content,
 	})
 
 	return