Browse Source

server: serve /v2/admin on raftPubAddr

Yicheng Qin 11 years ago
parent
commit
d0dc7427dd
2 changed files with 3 additions and 2 deletions
  1. 1 0
      etcd/etcd_test.go
  2. 2 2
      etcd/participant.go

+ 1 - 0
etcd/etcd_test.go

@@ -490,6 +490,7 @@ func initTestServer(c *config.Config, id int64, tls bool) (e *Server, h *httptes
 	m.Handle("/", e)
 	m.Handle("/", e)
 	m.Handle("/raft", e.RaftHandler())
 	m.Handle("/raft", e.RaftHandler())
 	m.Handle("/raft/", e.RaftHandler())
 	m.Handle("/raft/", e.RaftHandler())
+	m.Handle("/v2/admin/", e.RaftHandler())
 
 
 	if addr == "127.0.0.1:4001" {
 	if addr == "127.0.0.1:4001" {
 		if tls {
 		if tls {

+ 2 - 2
etcd/participant.go

@@ -144,8 +144,8 @@ func newParticipant(id int64, pubAddr string, raftPubAddr string, dir string, cl
 	p.Handle(v2peersPrefix, handlerErr(p.serveMachines))
 	p.Handle(v2peersPrefix, handlerErr(p.serveMachines))
 	p.Handle(v2LeaderPrefix, handlerErr(p.serveLeader))
 	p.Handle(v2LeaderPrefix, handlerErr(p.serveLeader))
 	p.Handle(v2StoreStatsPrefix, handlerErr(p.serveStoreStats))
 	p.Handle(v2StoreStatsPrefix, handlerErr(p.serveStoreStats))
-	p.Handle(v2adminConfigPrefix, handlerErr(p.serveAdminConfig))
-	p.Handle(v2adminMachinesPrefix, handlerErr(p.serveAdminMachines))
+	p.rh.Handle(v2adminConfigPrefix, handlerErr(p.serveAdminConfig))
+	p.rh.Handle(v2adminMachinesPrefix, handlerErr(p.serveAdminMachines))
 
 
 	// TODO: remind to set application/json for /v2/stats endpoint
 	// TODO: remind to set application/json for /v2/stats endpoint