From bb7e1195b630f619ff2b55cb44c710df5ae850a7 Mon Sep 17 00:00:00 2001 From: Thomas Mitchell Date: Wed, 13 May 2020 19:31:49 -0400 Subject: [PATCH] Sched out displays ID --- client/doomsday/client.go | 1 + cmd/scheduler.go | 4 +++- server/server.go | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/client/doomsday/client.go b/client/doomsday/client.go index 2a52600..18b1eb3 100644 --- a/client/doomsday/client.go +++ b/client/doomsday/client.go @@ -184,6 +184,7 @@ type GetSchedulerTask struct { Backend string `json:"backend"` Reason string `json:"reason"` Kind string `json:"kind"` + ID uint `json:"id"` Ready bool `json:"ready"` } diff --git a/cmd/scheduler.go b/cmd/scheduler.go index a808907..c82a6c7 100644 --- a/cmd/scheduler.go +++ b/cmd/scheduler.go @@ -3,6 +3,7 @@ package main import ( "fmt" "os" + "strconv" "time" "github.com/doomsday-project/doomsday/client/doomsday" @@ -41,7 +42,7 @@ func printSchedTaskList(tasks []doomsday.GetSchedulerTask) { table.SetRowLine(true) table.SetAutoWrapText(false) table.SetReflowDuringAutoWrap(false) - table.SetHeader([]string{"At", "Backend", "Kind", "Reason", "Ready"}) + table.SetHeader([]string{"ID", "At", "Backend", "Kind", "Reason", "Ready"}) table.SetAlignment(tablewriter.ALIGN_RIGHT) readyStr := ansi.Sprintf("@G{YES}") @@ -54,6 +55,7 @@ func printSchedTaskList(tasks []doomsday.GetSchedulerTask) { readyOutStr = readyStr } table.Append([]string{ + strconv.FormatUint(uint64(task.ID), 10), timeUntilStr, task.Backend, task.Kind, diff --git a/server/server.go b/server/server.go index 1e8cd79..3782c6a 100644 --- a/server/server.go +++ b/server/server.go @@ -197,6 +197,7 @@ func getScheduler(manager *SourceManager) func(w http.ResponseWriter, r *http.Re Backend: schedData.Running[i].Backend, Reason: schedData.Running[i].Reason, Kind: schedData.Running[i].Kind, + ID: schedData.Running[i].ID, Ready: schedData.Running[i].Ready, }) } @@ -207,6 +208,7 @@ func getScheduler(manager *SourceManager) func(w http.ResponseWriter, r *http.Re Backend: schedData.Pending[i].Backend, Reason: schedData.Pending[i].Reason, Kind: schedData.Pending[i].Kind, + ID: schedData.Pending[i].ID, Ready: schedData.Pending[i].Ready, }) }