luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

command/members: USe the columnize library for members

This commit is contained in:
Armon Dadgar 2014-03-05 19:52:31 -08:00
parent ccd9d0b001
commit ae1bb3930b
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
command/members.go
View File

@ -5,6 +5,7 @@ import (
"fmt"
"github.com/hashicorp/consul/command/agent"
"github.com/mitchellh/cli"
"github.com/ryanuber/columnize"
"net"
"regexp"
"strings"
@ -85,6 +86,7 @@ func (c *MembersCommand) Run(args []string) int {
return 1
}
result := make([]string, 0, len(members))
for _, member := range members {
// Skip the non-matching members
if !roleRe.MatchString(member.Tags["role"]) || !statusRe.MatchString(member.Status) {
@ -99,17 +101,21 @@ func (c *MembersCommand) Run(args []string) int {
tags := strings.Join(tagPairs, ",")
addr := net.TCPAddr{IP: member.Addr, Port: int(member.Port)}
c.Ui.Output(fmt.Sprintf("%s %s %s %s",
member.Name, addr.String(), member.Status, tags))
line := fmt.Sprintf("%s|%s|%s|%s",
member.Name, addr.String(), member.Status, tags)
if detailed {
c.Ui.Output(fmt.Sprintf(" Protocol Version: %d",
member.DelegateCur))
c.Ui.Output(fmt.Sprintf(" Available Protocol Range: [%d, %d]",
member.DelegateMin, member.DelegateMax))
line += fmt.Sprintf(
"|Protocol Version: %d|Available Protocol Range: [%d, %d]",
member.DelegateCur, member.DelegateMin, member.DelegateMax)
}
result = append(result, line)
}
// Generate the columnized version
output, _ := columnize.SimpleFormat(result)
c.Ui.Output(string(output))
return 0
}