Skip to content

Commit

Permalink
Feat: Improve container errors messages format, fix #6042
Browse files Browse the repository at this point in the history
  • Loading branch information
penyaskito committed Apr 2, 2024
1 parent 1935177 commit ada4ea2
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions pkg/dockerutil/dockerutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -531,22 +531,23 @@ func ContainerWaitLog(waittime int, labels map[string]string, expectedLog string

// getSuggestedCommandForContainerLog returns a command that can be used to find out what is wrong with a container
func getSuggestedCommandForContainerLog(container *dockerTypes.Container) (string, string) {
suggestedCommand := ""
suggestedCommands := []string{}
service := container.Labels["com.docker.compose.service"]
if service != "" && service != "ddev-router" && service != "ddev-ssh-agent" {
suggestedCommand = suggestedCommand + fmt.Sprintf("'ddev logs -s %s' and ", service)
suggestedCommands = append(suggestedCommands, fmt.Sprintf("ddev logs -s %s", service))
}
name := strings.TrimPrefix(container.Names[0], "/")
if name != "" {
suggestedCommand = suggestedCommand + fmt.Sprintf("'docker logs %s' and 'docker inspect --format \"{{ json .State.Health }}\" %s'", name, name)
suggestedCommands = append(suggestedCommands, fmt.Sprintf("docker logs %s", name), fmt.Sprintf("docker inspect --format \"{{ json .State.Health }}\" %s", name))
}
// Should never happen, but added just in case
if name == "" {
name = "unknown"
}
if suggestedCommand == "" {
suggestedCommand = "'ddev logs' and 'docker logs CONTAINER' (find CONTAINER with 'docker ps') and 'docker inspect --format \"{{ json .State.Health }}\" CONTAINER'"
if len(suggestedCommands) == 0 {
suggestedCommands = append(suggestedCommands, "ddev logs", "docker logs CONTAINER (find CONTAINER with 'docker ps')", "docker inspect --format \"{{ json .State.Health }}\" CONTAINER")
}
suggestedCommand, _ := util.ArrayToReadableOutput(suggestedCommands)
return name, suggestedCommand
}

Expand Down

0 comments on commit ada4ea2

Please sign in to comment.