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