command/members: Remove the detailed flag, abstraction leak

pull/19/head
Armon Dadgar 11 years ago
parent cd6842ff6b
commit 31a85bb64e

@ -25,9 +25,6 @@ Usage: consul members [options]
Options: Options:
-detailed Additional information such as protocol verions
will be shown.
-role=<regexp> If provided, output is filtered to only nodes matching -role=<regexp> If provided, output is filtered to only nodes matching
the regular expression for role the regular expression for role
@ -43,11 +40,10 @@ Options:
} }
func (c *MembersCommand) Run(args []string) int { func (c *MembersCommand) Run(args []string) int {
var detailed, wan bool var wan bool
var roleFilter, statusFilter string var roleFilter, statusFilter string
cmdFlags := flag.NewFlagSet("members", flag.ContinueOnError) cmdFlags := flag.NewFlagSet("members", flag.ContinueOnError)
cmdFlags.Usage = func() { c.Ui.Output(c.Help()) } cmdFlags.Usage = func() { c.Ui.Output(c.Help()) }
cmdFlags.BoolVar(&detailed, "detailed", false, "detailed output")
cmdFlags.BoolVar(&wan, "wan", false, "wan members") cmdFlags.BoolVar(&wan, "wan", false, "wan members")
cmdFlags.StringVar(&roleFilter, "role", ".*", "role filter") cmdFlags.StringVar(&roleFilter, "role", ".*", "role filter")
cmdFlags.StringVar(&statusFilter, "status", ".*", "status 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)} addr := net.TCPAddr{IP: member.Addr, Port: int(member.Port)}
line := fmt.Sprintf("%s|%s|%s|%s", line := fmt.Sprintf("%s|%s|%s|%s",
member.Name, addr.String(), member.Status, tags) 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) result = append(result, line)
} }

@ -22,9 +22,6 @@ Usage: `consul members [options]`
The command-line flags are all optional. The list of available flags are: 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 * `-role` - If provided, output is filtered to only nodes matching
the regular expression for role the regular expression for role

Loading…
Cancel
Save