added backend name into sched display

doomsday-project · May 6, 2020 · 7f142f4 · 7f142f4
1 parent d19bf01
commit 7f142f4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/client/doomsday/client.go b/client/doomsday/client.go
@@ -179,10 +179,11 @@ type GetSchedulerResponse struct {
 }
 
 type GetSchedulerTask struct {
-	At     int64  `json:"at"`
-	Reason string `json:"reason"`
-	Kind   string `json:"kind"`
-	Ready  bool   `json:"ready"`
+	At      int64  `json:"at"`
+	Backend string `json:"backend"`
+	Reason  string `json:"reason"`
+	Kind    string `json:"kind"`
+	Ready   bool   `json:"ready"`
 }
 
 func (c *Client) GetSchedulerState() (*GetSchedulerResponse, error) {

diff --git a/cmd/scheduler.go b/cmd/scheduler.go
@@ -29,7 +29,8 @@ func printSchedTaskList(tasks []doomsday.GetSchedulerTask) {
 	table.SetRowLine(true)
 	table.SetAutoWrapText(false)
 	table.SetReflowDuringAutoWrap(false)
-	table.SetHeader([]string{"At", "Reason", "Kind", "Ready"})
+	table.SetHeader([]string{"At", "Backend", "Kind", "Reason", "Ready"})
+	table.SetAlignment(tablewriter.ALIGN_RIGHT)
 
 	readyStr := ansi.Sprintf("@G{YES}")
 	notReadyStr := ansi.Sprintf("@R{NO}")
@@ -42,8 +43,9 @@ func printSchedTaskList(tasks []doomsday.GetSchedulerTask) {
 		}
 		table.Append([]string{
 			timeUntilStr,
-			task.Reason,
+			task.Backend,
 			task.Kind,
+			task.Reason,
 			readyOutStr,
 		})
 	}

diff --git a/server/scheduler.go b/server/scheduler.go
@@ -199,10 +199,11 @@ type SchedulerState struct {
 }
 
 type SchedulerTask struct {
-	At     time.Time
-	Reason string
-	Kind   string
-	Ready  bool
+	At      time.Time
+	Backend string
+	Reason  string
+	Kind    string
+	Ready   bool
 }
 
 func (t *taskQueue) dumpState() SchedulerState {
@@ -215,10 +216,11 @@ func (t *taskQueue) dumpState() SchedulerState {
 
 	for _, task := range t.data {
 		ret.Tasks = append(ret.Tasks, SchedulerTask{
-			At:     task.runTime,
-			Reason: task.reason.String(),
-			Kind:   task.kind.String(),
-			Ready:  task.ready,
+			At:      task.runTime,
+			Backend: task.source.Core.Name,
+			Reason:  task.reason.String(),
+			Kind:    task.kind.String(),
+			Ready:   task.ready,
 		})
 	}
 

diff --git a/server/server.go b/server/server.go
@@ -192,10 +192,11 @@ func getScheduler(manager *SourceManager) func(w http.ResponseWriter, r *http.Re
 
 		for i := range schedData.Tasks {
 			respRaw.Tasks = append(respRaw.Tasks, doomsday.GetSchedulerTask{
-				At:     schedData.Tasks[i].At.Unix(),
-				Reason: schedData.Tasks[i].Reason,
-				Kind:   schedData.Tasks[i].Kind,
-				Ready:  schedData.Tasks[i].Ready,
+				At:      schedData.Tasks[i].At.Unix(),
+				Backend: schedData.Tasks[i].Backend,
+				Reason:  schedData.Tasks[i].Reason,
+				Kind:    schedData.Tasks[i].Kind,
+				Ready:   schedData.Tasks[i].Ready,
 			})
 		}