Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdctl: respect --write-out=json for endpoint status command

Browse Source
This commit is contained in:
Anthony Romano 2016-04-13 17:04:31 -07:00
parent e9aa8ff235
commit f07350735d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etcdctl/ctlv3/command/ep_command.go
View File

@ -104,8 +104,8 @@ func epHealthCommandFunc(cmd *cobra.Command, args []string) {
} }
type epStatus struct { type epStatus struct {
ep string Ep string `json:"Endpoint"`
resp *v3.StatusResponse Resp *v3.StatusResponse `json:"Status"`
} }
func epStatusCommandFunc(cmd *cobra.Command, args []string) { func epStatusCommandFunc(cmd *cobra.Command, args []string) {
@ -122,7 +122,7 @@ func epStatusCommandFunc(cmd *cobra.Command, args []string) {
fmt.Fprintf(os.Stderr, "Failed to get the status of endpoint %s (%v)\n", ep, serr) fmt.Fprintf(os.Stderr, "Failed to get the status of endpoint %s (%v)\n", ep, serr)
continue continue
} }
statusList = append(statusList, epStatus{ep: ep, resp: resp}) statusList = append(statusList, epStatus{Ep: ep, Resp: resp})
} }
display.EndpointStatus(statusList) display.EndpointStatus(statusList)

14
etcdctl/ctlv3/command/printer.go
View File

@ -134,13 +134,13 @@ func (s *simplePrinter) EndpointStatus(statusList []epStatus) {
for _, status := range statusList { for _, status := range statusList {
table.Append([]string{ table.Append([]string{
fmt.Sprint(status.ep), fmt.Sprint(status.Ep),
fmt.Sprintf("%x", status.resp.Header.MemberId), fmt.Sprintf("%x", status.Resp.Header.MemberId),
fmt.Sprint(status.resp.Version), fmt.Sprint(status.Resp.Version),
fmt.Sprint(humanize.Bytes(uint64(status.resp.DbSize))), fmt.Sprint(humanize.Bytes(uint64(status.Resp.DbSize))),
fmt.Sprint(status.resp.Leader == status.resp.Header.MemberId), fmt.Sprint(status.Resp.Leader == status.Resp.Header.MemberId),
fmt.Sprint(status.resp.RaftTerm), fmt.Sprint(status.Resp.RaftTerm),
fmt.Sprint(status.resp.RaftIndex), fmt.Sprint(status.Resp.RaftIndex),
}) })
} }