From 31a85bb64eaa10567b88f0e2a3278e7bdb888497 Mon Sep 17 00:00:00 2001 From: Armon Dadgar Date: Sun, 9 Mar 2014 15:46:43 -0700 Subject: [PATCH] command/members: Remove the detailed flag, abstraction leak --- command/members.go | 12 +----------- website/source/docs/commands/members.html.markdown | 3 --- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/command/members.go b/command/members.go index 3e3e1ef123..7efbba54d4 100644 --- a/command/members.go +++ b/command/members.go @@ -25,9 +25,6 @@ Usage: consul members [options] Options: - -detailed Additional information such as protocol verions - will be shown. - -role= If provided, output is filtered to only nodes matching the regular expression for role @@ -43,11 +40,10 @@ Options: } func (c *MembersCommand) Run(args []string) int { - var detailed, wan bool + var wan bool var roleFilter, statusFilter string cmdFlags := flag.NewFlagSet("members", flag.ContinueOnError) cmdFlags.Usage = func() { c.Ui.Output(c.Help()) } - cmdFlags.BoolVar(&detailed, "detailed", false, "detailed output") cmdFlags.BoolVar(&wan, "wan", false, "wan members") cmdFlags.StringVar(&roleFilter, "role", ".*", "role filter") cmdFlags.StringVar(&statusFilter, "status", ".*", "status filter") @@ -103,12 +99,6 @@ func (c *MembersCommand) Run(args []string) int { addr := net.TCPAddr{IP: member.Addr, Port: int(member.Port)} line := fmt.Sprintf("%s|%s|%s|%s", member.Name, addr.String(), member.Status, tags) - - if detailed { - line += fmt.Sprintf( - "|Protocol Version: %d|Available Protocol Range: [%d, %d]", - member.DelegateCur, member.DelegateMin, member.DelegateMax) - } result = append(result, line) } diff --git a/website/source/docs/commands/members.html.markdown b/website/source/docs/commands/members.html.markdown index 45ede2ac0d..f5a2b7d1e6 100644 --- a/website/source/docs/commands/members.html.markdown +++ b/website/source/docs/commands/members.html.markdown @@ -22,9 +22,6 @@ Usage: `consul members [options]` The command-line flags are all optional. The list of available flags are: -* `-detailed` - Will show additional information per member, such as the - protocol version that each can understand and that each is speaking. - * `-role` - If provided, output is filtered to only nodes matching the regular expression for role