Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sort output in the consul members command #969

Merged
merged 2 commits into from
May 22, 2015
+20 −2
Merged

Sort output in the consul members command #969

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aa2115
Sort tags in consul members -detailed output
tgwizard May 22, 2015
7d0959b
Sort members in by name for consul members
tgwizard May 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions command/members.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/ryanuber/columnize"
"net"
"regexp"
"sort"
"strings"
)

Expand Down Expand Up @@ -95,6 +96,8 @@ func (c *MembersCommand) Run(args []string) int {
return 2
}

sort.Sort(ByMemberName(members))

// Generate the output
var result []string
if detailed {
Expand All @@ -110,6 +113,13 @@ func (c *MembersCommand) Run(args []string) int {
return 0
}

// so we can sort members by name
type ByMemberName []agent.Member

func (m ByMemberName) Len() int { return len(m) }
func (m ByMemberName) Swap(i, j int) { m[i], m[j] = m[j], m[i] }
func (m ByMemberName) Less(i, j int) bool { return m[i].Name < m[j].Name }

// standardOutput is used to dump the most useful information about nodes
// in a more human-friendly format
func (c *MembersCommand) standardOutput(members []agent.Member) []string {
Expand Down Expand Up @@ -152,11 +162,19 @@ func (c *MembersCommand) detailedOutput(members []agent.Member) []string {
header := "Node|Address|Status|Tags"
result = append(result, header)
for _, member := range members {
// Get the tags sorted by key
tagKeys := make([]string, 0, len(member.Tags))
for key := range member.Tags {
tagKeys = append(tagKeys, key)
}
sort.Strings(tagKeys)

// Format the tags as tag1=v1,tag2=v2,...
var tagPairs []string
for name, value := range member.Tags {
tagPairs = append(tagPairs, fmt.Sprintf("%s=%s", name, value))
for _, key := range tagKeys {
tagPairs = append(tagPairs, fmt.Sprintf("%s=%s", key, member.Tags[key]))
}

tags := strings.Join(tagPairs, ",")

addr := net.TCPAddr{IP: member.Addr, Port: int(member.Port)}
Expand Down