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

Merge pull request #1298 from jonboulle/members

Browse Source 
etcdhttp: remove members handling for now
This commit is contained in:
Jonathan Boulle 2014-10-14 13:57:52 -07:00
commit 48c195fac7
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcdserver/etcdhttp/http.go
View File

@ -22,7 +22,6 @@ import (
const (
keysPrefix = "/v2/keys"
membersPrefix = "/v2/members"
deprecatedMachinesPrefix = "/v2/machines"
raftPrefix = "/raft"
@ -49,7 +48,6 @@ func NewClientHandler(server *etcdserver.EtcdServer) http.Handler {
// TODO: dynamic configuration may make this outdated. take care of it.
// TODO: dynamic configuration may introduce race also.
// TODO: add serveMembers
mux.HandleFunc(membersPrefix, sh.serveMachines)
mux.HandleFunc(deprecatedMachinesPrefix, sh.serveMachines)
mux.HandleFunc("/", http.NotFound)
return mux

4
etcdserver/etcdhttp/http_test.go
View File

@ -581,7 +581,7 @@ func (w *dummyWatcher) EventChan() chan *store.Event {
func (w *dummyWatcher) StartIndex() uint64 { return w.sidx }
func (w *dummyWatcher) Remove() {}
func TestV2MembersEndpoint(t *testing.T) {
func TestV2DeprecatedMachinesEndpoint(t *testing.T) {
tests := []struct {
method string
wcode int
@ -596,7 +596,7 @@ func TestV2MembersEndpoint(t *testing.T) {
defer s.Close()
for _, tt := range tests {
req, err := http.NewRequest(tt.method, s.URL+membersPrefix, nil)
req, err := http.NewRequest(tt.method, s.URL+deprecatedMachinesPrefix, nil)
if err != nil {
t.Fatal(err)
}