Browse Source

etcdctl/ctlv3: protobuf write-out for member list

Fix https://github.com/coreos/etcd/issues/5297.
Gyu-Ho Lee 9 years ago
parent
commit
5cba7080bc
2 changed files with 5 additions and 5 deletions
  1. 4 4
      etcdctl/ctlv3/command/printer.go
  2. 1 1
      etcdctl/ctlv3/ctl.go

+ 4 - 4
etcdctl/ctlv3/command/printer.go

@@ -275,15 +275,15 @@ func (p *pbPrinter) Alarm(r v3.AlarmResponse) {
 	printPB((*pb.AlarmResponse)(&r))
 }
 
-func (pb *pbPrinter) MemberList(r v3.MemberListResponse) {
-	ExitWithError(ExitBadFeature, errors.New("only support simple or json as output format"))
+func (p *pbPrinter) MemberList(r v3.MemberListResponse) {
+	printPB((*pb.MemberListResponse)(&r))
 }
 
-func (pb *pbPrinter) EndpointStatus(statusList []epStatus) {
+func (p *pbPrinter) EndpointStatus(statusList []epStatus) {
 	ExitWithError(ExitBadFeature, errors.New("only support simple or json as output format"))
 }
 
-func (pb *pbPrinter) DBStatus(r dbstatus) {
+func (p *pbPrinter) DBStatus(r dbstatus) {
 	ExitWithError(ExitBadFeature, errors.New("only support simple or json as output format"))
 }
 

+ 1 - 1
etcdctl/ctlv3/ctl.go

@@ -45,7 +45,7 @@ var (
 func init() {
 	rootCmd.PersistentFlags().StringSliceVar(&globalFlags.Endpoints, "endpoints", []string{"127.0.0.1:2379", "127.0.0.1:22379", "127.0.0.1:32379"}, "gRPC endpoints")
 
-	rootCmd.PersistentFlags().StringVarP(&globalFlags.OutputFormat, "write-out", "w", "simple", "set the output format (simple, json, protobuf, table)")
+	rootCmd.PersistentFlags().StringVarP(&globalFlags.OutputFormat, "write-out", "w", "simple", "set the output format (simple, json, etc..)")
 	rootCmd.PersistentFlags().BoolVar(&globalFlags.IsHex, "hex", false, "print byte strings as hex encoded strings")
 
 	rootCmd.PersistentFlags().DurationVar(&globalFlags.DialTimeout, "dial-timeout", defaultDialTimeout, "dial timeout for client connections")