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

etcdserver/etcdhttp: use container for admin/members endpoint

Browse Source
This commit is contained in:
Jonathan Boulle 2014-10-23 22:52:39 -07:00
parent c8634428fa
commit 9b679de9dd
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etcdserver/etcdhttp/http.go
View File

@ -163,7 +163,11 @@ func (h serverHandler) serveAdminMembers(w http.ResponseWriter, r *http.Request)
case "GET":
idStr := strings.TrimPrefix(r.URL.Path, adminMembersPrefix)
if idStr == "" {
ms := h.clusterInfo.Members()
ms := struct {
Members []*etcdserver.Member
}{
Members: h.clusterInfo.Members(),
}
w.Header().Set("Content-Type", "application/json")
if err := json.NewEncoder(w).Encode(ms); err != nil {
log.Printf("etcdhttp: %v", err)

8
etcdserver/etcdhttp/http_test.go
View File

@ -1627,7 +1627,13 @@ func TestServeAdminMembers(t *testing.T) {
clusterInfo: cluster,
}
msb, err := json.Marshal([]etcdserver.Member{memb1, memb2})
msb, err := json.Marshal(
struct {
Members []etcdserver.Member
}{
Members: []etcdserver.Member{memb1, memb2},
},
)
if err != nil {
t.Fatal(err)
}