From 9a2231eb7037ca7d1dea8b1ecda29ed948610691 Mon Sep 17 00:00:00 2001
From: Newnius <newnius.cn@gmail.com>
Date: Fri, 1 May 2020 14:06:12 +0800
Subject: [PATCH] update

---
 src/job_manager.go | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/job_manager.go b/src/job_manager.go
index 167603e..652a062 100644
--- a/src/job_manager.go
+++ b/src/job_manager.go
@@ -27,6 +27,10 @@ func (jm *JobManager) start() {
 	InstanceJobHistoryLogger().submitJob(jm.job)
 
 	/* request for resources */
+	for range jm.job.Tasks {
+		jm.resources = append(jm.resources, NodeStatus{})
+	}
+
 	for i := range jm.job.Tasks {
 		var resource NodeStatus
 		for {
@@ -40,7 +44,7 @@ func (jm *JobManager) start() {
 			time.Sleep(time.Second * 1)
 		}
 		log.Info("Receive resource", resource)
-		jm.resources = append(jm.resources, resource)
+		jm.resources[i] = resource
 
 		for _, t := range resource.Status {
 			jm.scheduler.Attach(t.UUID, jm.job.Name)
@@ -195,7 +199,12 @@ func (jm *JobManager) logs(taskName string) MsgLog {
 
 func (jm *JobManager) status() MsgJobStatus {
 	var tasksStatus []TaskStatus
-	for _, taskStatus := range jm.jobStatus.tasks {
+	for range jm.jobStatus.tasks {
+		tasksStatus = append(tasksStatus, TaskStatus{})
+	}
+
+	for i, task := range jm.job.Tasks {
+		taskStatus := jm.jobStatus.tasks[task.Name]
 		spider := Spider{}
 		spider.Method = "GET"
 		spider.URL = "http://" + taskStatus.Node + ":8000/status?id=" + taskStatus.Id
@@ -218,7 +227,7 @@ func (jm *JobManager) status() MsgJobStatus {
 			continue
 		}
 		res.Status.Node = taskStatus.Node
-		tasksStatus = append(tasksStatus, res.Status)
+		tasksStatus[i] = res.Status
 	}
 
 	return MsgJobStatus{Status: tasksStatus}