|
|
@@ -220,23 +220,15 @@ func GetNewestJobs(ctx *context.APIContext) { |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
jobsCloudbrain, err := models.GetNewestJobsByType() |
|
|
|
idsCloudbrain, err := models.GetNewestJobsByType() |
|
|
|
if err != nil { |
|
|
|
log.Error("GetNewestJobsByType(%s) failed:%v", err.Error()) |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
var ids []int64 |
|
|
|
|
|
|
|
for _, id := range idsC2Net { |
|
|
|
log.Info("%d", id) |
|
|
|
} |
|
|
|
|
|
|
|
ids := make([]int64, len(idsC2Net), cap(idsC2Net)*2) |
|
|
|
copy(ids, idsC2Net) |
|
|
|
for _, job := range jobsCloudbrain { |
|
|
|
log.Info("%d, %d", job.Type, job.ID) |
|
|
|
ids = append(ids, job.ID) |
|
|
|
} |
|
|
|
copy(ids, idsCloudbrain) |
|
|
|
|
|
|
|
jobs, err := models.GetCloudbrainByIDs(ids) |
|
|
|
if err != nil { |
|
|
|