From 83c953b153b2052d8ce546f9ec0862390cd9574f Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Sat, 14 Feb 2015 20:08:52 -0800 Subject: [PATCH] etcdhttp: move /stats to /debug/vars --- etcdserver/etcdhttp/client.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/etcdserver/etcdhttp/client.go b/etcdserver/etcdhttp/client.go index a5bc6c484..e6da4537f 100644 --- a/etcdserver/etcdhttp/client.go +++ b/etcdserver/etcdhttp/client.go @@ -47,7 +47,7 @@ const ( deprecatedMachinesPrefix = "/v2/machines" membersPrefix = "/v2/members" statsPrefix = "/v2/stats" - statsPath = "/stats" + varsPath = "/debug/vars" metricsPath = "/metrics" healthPath = "/health" versionPath = "/version" @@ -85,7 +85,7 @@ func NewClientHandler(server *etcdserver.EtcdServer) http.Handler { mux.HandleFunc(statsPrefix+"/store", sh.serveStore) mux.HandleFunc(statsPrefix+"/self", sh.serveSelf) mux.HandleFunc(statsPrefix+"/leader", sh.serveLeader) - mux.HandleFunc(statsPath, serveStats) + mux.HandleFunc(varsPath, serveVars) mux.Handle(metricsPath, prometheus.Handler()) mux.Handle(membersPrefix, mh) mux.Handle(membersPrefix+"/", mh) @@ -288,9 +288,8 @@ func (h *statsHandler) serveLeader(w http.ResponseWriter, r *http.Request) { w.Write(stats) } -func serveStats(w http.ResponseWriter, r *http.Request) { +func serveVars(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json; charset=utf-8") - // TODO: getting one key or a prefix of keys based on path fmt.Fprintf(w, "{\n") first := true expvar.Do(func(kv expvar.KeyValue) {