Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

support show numbers of global service in service ls command 

Signed-off-by: allencloud <allen.sun@daocloud.io>
This commit is contained in:
allencloud 2016-10-25 11:39:53 +08:00
parent 3baa727ed1
commit 7891d349b3
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
command/service/list.go
View File

@ -17,7 +17,7 @@ import (
) )
const ( const (
listItemFmt = "%s\t%s\t%s\t%s\n" listItemFmt = "%s\t%s\t%s\t%s\t%s\n"
) )
type listOptions struct { type listOptions struct {
@ -74,7 +74,7 @@ func runList(dockerCli *command.DockerCli, opts listOptions) error {
PrintNotQuiet(out, services, nodes, tasks) PrintNotQuiet(out, services, nodes, tasks)
} else if !opts.quiet { } else if !opts.quiet {
// no services and not quiet, print only one line with columns ID, NAME, REPLICAS... // no services and not quiet, print only one line with columns ID, NAME, MODE, REPLICAS...
PrintNotQuiet(out, services, []swarm.Node{}, []swarm.Task{}) PrintNotQuiet(out, services, []swarm.Node{}, []swarm.Task{})
} else { } else {
PrintQuiet(out, services) PrintQuiet(out, services)
@ -94,34 +94,45 @@ func PrintNotQuiet(out io.Writer, services []swarm.Service, nodes []swarm.Node,
} }
running := map[string]int{} running := map[string]int{}
tasksNoShutdown := map[string]int{}
for _, task := range tasks { for _, task := range tasks {
if _, nodeActive := activeNodes[task.NodeID]; nodeActive && task.Status.State == "running" { if task.DesiredState != swarm.TaskStateShutdown {
tasksNoShutdown[task.ServiceID]++
}
if _, nodeActive := activeNodes[task.NodeID]; nodeActive && task.Status.State == swarm.TaskStateRunning {
running[task.ServiceID]++ running[task.ServiceID]++
} }
} }
printTable(out, services, running) printTable(out, services, running, tasksNoShutdown)
} }
func printTable(out io.Writer, services []swarm.Service, running map[string]int) { func printTable(out io.Writer, services []swarm.Service, running, tasksNoShutdown map[string]int) {
writer := tabwriter.NewWriter(out, 0, 4, 2, ' ', 0) writer := tabwriter.NewWriter(out, 0, 4, 2, ' ', 0)
// Ignore flushing errors // Ignore flushing errors
defer writer.Flush() defer writer.Flush()
fmt.Fprintf(writer, listItemFmt, "ID", "NAME", "REPLICAS", "IMAGE") fmt.Fprintf(writer, listItemFmt, "ID", "NAME", "MODE", "REPLICAS", "IMAGE")
for _, service := range services { for _, service := range services {
mode := ""
replicas := "" replicas := ""
if service.Spec.Mode.Replicated != nil && service.Spec.Mode.Replicated.Replicas != nil { if service.Spec.Mode.Replicated != nil && service.Spec.Mode.Replicated.Replicas != nil {
mode = "replicated"
replicas = fmt.Sprintf("%d/%d", running[service.ID], *service.Spec.Mode.Replicated.Replicas) replicas = fmt.Sprintf("%d/%d", running[service.ID], *service.Spec.Mode.Replicated.Replicas)
} else if service.Spec.Mode.Global != nil { } else if service.Spec.Mode.Global != nil {
replicas = "global" mode = "global"
replicas = fmt.Sprintf("%d/%d", running[service.ID], tasksNoShutdown[service.ID])
} }
fmt.Fprintf( fmt.Fprintf(
writer, writer,
listItemFmt, listItemFmt,
stringid.TruncateID(service.ID), stringid.TruncateID(service.ID),
service.Spec.Name, service.Spec.Name,
mode,
replicas, replicas,
service.Spec.TaskTemplate.ContainerSpec.Image) service.Spec.TaskTemplate.ContainerSpec.Image)
} }