From c40cb97dbc0aba8c7ea9eba8d709f4e73467d435 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Fri, 1 Feb 2019 09:28:36 -0800 Subject: [PATCH] cli: do not duplicate reschedule headers per group Fixes #5291 --- command/job_status.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/command/job_status.go b/command/job_status.go index 9e7f9db8b..6ee4cd00a 100644 --- a/command/job_status.go +++ b/command/job_status.go @@ -575,6 +575,7 @@ func (c *JobStatusCommand) outputReschedulingEvals(client *api.Client, job *api. } sort.Strings(taskGroups) var evalDetails []string + first := true for _, taskGroup := range taskGroups { evalID := followUpEvalIds[taskGroup] evaluation, _, err := client.Evaluations().Info(evalID, nil) @@ -585,13 +586,18 @@ func (c *JobStatusCommand) outputReschedulingEvals(client *api.Client, job *api. } evalTime := prettyTimeDiff(evaluation.WaitUntil, time.Now()) if c.verbose { - delayedEvalInfos = append(delayedEvalInfos, "Task Group|Reschedule Policy|Eval ID|Eval Time") + if first { + delayedEvalInfos = append(delayedEvalInfos, "Task Group|Reschedule Policy|Eval ID|Eval Time") + } rp := job.LookupTaskGroup(taskGroup).ReschedulePolicy evalDetails = append(evalDetails, fmt.Sprintf("%s|%s|%s|%s", taskGroup, rp.String(), limit(evalID, uuidLength), evalTime)) } else { - delayedEvalInfos = append(delayedEvalInfos, "Task Group|Eval ID|Eval Time") + if first { + delayedEvalInfos = append(delayedEvalInfos, "Task Group|Eval ID|Eval Time") + } evalDetails = append(evalDetails, fmt.Sprintf("%s|%s|%s", taskGroup, limit(evalID, uuidLength), evalTime)) } + first = false } if len(evalDetails) == 0 { return nil