mroot/lazydocker
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazydocker.git synced 2026-07-25 08:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #201 from stirante/health-check

Browse source 
Add health check to container list
This commit is contained in:
Jesse Duffield 2020-09-23 20:15:42 +10:00 • committed by GitHub
commit 386334b1f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
pkg/commands/container.go
View file

@ -53,17 +53,18 @@ type Details struct {
Path string `json:"Path"` Path string `json:"Path"`
Args []string `json:"Args"` Args []string `json:"Args"`
State struct { State struct {
Status string `json:"Status"` Status string `json:"Status"`
Running bool `json:"Running"` Running bool `json:"Running"`
Paused bool `json:"Paused"` Paused bool `json:"Paused"`
Restarting bool `json:"Restarting"` Restarting bool `json:"Restarting"`
OOMKilled bool `json:"OOMKilled"` OOMKilled bool `json:"OOMKilled"`
Dead bool `json:"Dead"` Dead bool `json:"Dead"`
Pid int `json:"Pid"` Pid int `json:"Pid"`
ExitCode int `json:"ExitCode"` ExitCode int `json:"ExitCode"`
Error string `json:"Error"` Error string `json:"Error"`
StartedAt time.Time `json:"StartedAt"` StartedAt time.Time `json:"StartedAt"`
FinishedAt time.Time `json:"FinishedAt"` FinishedAt time.Time `json:"FinishedAt"`
Health types.Health `json:"Health"`
} `json:"State"` } `json:"State"`
Image string `json:"Image"` Image string `json:"Image"`
ResolvConfPath string `json:"ResolvConfPath"` ResolvConfPath string `json:"ResolvConfPath"`
@ -257,10 +258,26 @@ func (c *Container) GetDisplayStrings(isFocused bool) []string {
func (c *Container) GetDisplayStatus() string { func (c *Container) GetDisplayStatus() string {
state := c.Container.State state := c.Container.State
if c.Container.State == "exited" { if c.Container.State == "exited" {
state += " (" + strconv.Itoa(c.Details.State.ExitCode) + ")" return utils.ColoredString(state+" ("+strconv.Itoa(c.Details.State.ExitCode)+")", c.GetColor())
} }
return utils.ColoredString(state, c.GetColor()) return utils.ColoredString(state, c.GetColor()) + c.healthStatusString()
}
func (c *Container) healthStatusString() string {
healthStatusColorMap := map[string]color.Attribute{
"healthy": color.FgGreen,
"unhealthy": color.FgRed,
"starting": color.FgYellow,
}
if c.Container.State != "running" {
return ""
}
healthStatus := c.Details.State.Health.Status
if healthStatusColor, ok := healthStatusColorMap[healthStatus]; ok {
return utils.ColoredString(" ("+healthStatus+")", healthStatusColor)
}
return ""
} }
// GetDisplayCPUPerc colors the cpu percentage based on how extreme it is // GetDisplayCPUPerc colors the cpu percentage based on how extreme it is

7
pkg/utils/utils.go
View file

@ -52,6 +52,13 @@ func ColoredString(str string, colorAttribute color.Attribute) string {
return ColoredStringDirect(str, colour) return ColoredStringDirect(str, colour)
} }
// MultiColoredString takes a string and an array of colour attributes and returns a colored
// string with those attributes
func MultiColoredString(str string, colorAttribute ...color.Attribute) string {
colour := color.New(colorAttribute...)
return ColoredStringDirect(str, colour)
}
// ColoredStringDirect used for aggregating a few color attributes rather than // ColoredStringDirect used for aggregating a few color attributes rather than
// just sending a single one // just sending a single one
func ColoredStringDirect(str string, colour *color.Color) string { func ColoredStringDirect(str string, colour *color.Color) string {