From d0dc7427ddc65b0f75dd20e86897d1dc92571dfb Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Mon, 4 Aug 2014 13:51:06 -0700 Subject: [PATCH] server: serve /v2/admin on raftPubAddr --- etcd/etcd_test.go | 1 + etcd/participant.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/etcd/etcd_test.go b/etcd/etcd_test.go index 1dcce9f21..a80a1fb3e 100644 --- a/etcd/etcd_test.go +++ b/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("/raft", e.RaftHandler()) m.Handle("/raft/", e.RaftHandler()) + m.Handle("/v2/admin/", e.RaftHandler()) if addr == "127.0.0.1:4001" { if tls { diff --git a/etcd/participant.go b/etcd/participant.go index 1b8a1dd60..4f033b9ce 100644 --- a/etcd/participant.go +++ b/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(v2LeaderPrefix, handlerErr(p.serveLeader)) 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