github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a test for status message generation. Fix a bug in reason message handling.

Browse Source
This commit is contained in:
Brendan Burns
2015-05-15 20:24:41 +01:00
parent f57f317830
commit a197b24fb7
2 changed files with 108 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubectl/resource_printer.go
View File

@@ -364,7 +364,7 @@ func interpretContainerStatus(status *api.ContainerStatus) (string, string, stri
if state != nil {
message = fmt.Sprintf("exit code %d", state.ExitCode)
if state.Reason != "" {
message = fmt.Sprintf("%s, reason: %s", state.Reason)
message = fmt.Sprintf("%s, reason: %s", message, state.Reason)
}
}
return message
@@ -380,7 +380,11 @@ func interpretContainerStatus(status *api.ContainerStatus) (string, string, stri
if message != "" {
message = "last termination: " + message
}
return "Running", translateTimestamp(state.Running.StartedAt), message, nil
stateMsg := "Running"
if !status.Ready {
stateMsg = stateMsg + " *not ready*"
}
return stateMsg, translateTimestamp(state.Running.StartedAt), message, nil
} else if state.Termination != nil {
return "Terminated", translateTimestamp(state.Termination.StartedAt), getTermMsg(state.Termination), nil
}