kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 18:35:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of restart in TaskEvents

Browse Source
This commit is contained in:
Alex Dadgar
2016-10-05 15:11:09 -07:00
parent b976633e4d
commit d200a835c9
6 changed files with 100 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
command/alloc_status.go
View File

@@ -325,11 +325,7 @@ func (c *AllocStatusCommand) outputTaskStatus(state *api.TaskState) {
case api.TaskRestarting:
in := fmt.Sprintf("Task restarting in %v", time.Duration(event.StartDelay))
if event.RestartReason != "" && event.RestartReason != client.ReasonWithinPolicy {
if event.StartDelay == 0 {
desc = event.RestartReason
} else {
desc = fmt.Sprintf("%s - %s", event.RestartReason, in)
}
desc = fmt.Sprintf("%s - %s", event.RestartReason, in)
} else {
desc = in
}
@@ -370,6 +366,12 @@ func (c *AllocStatusCommand) outputTaskStatus(state *api.TaskState) {
} else {
desc = fmt.Sprintf("Task being sent signal %v: %v", sig, reason)
}
case api.TaskRestartSignal:
if event.RestartReason != "" {
desc = event.RestartReason
} else {
desc = "Task signaled to restart"
}
}
// Reverse order so we are sorted by time