Resolve HTTP handler FIXME

This change makes the API a little more user friendly - all request URIs with the path `/v1/res/` will be treated as the same URI with path `/v1/res`.
NVIDIA · May 11, 2018 · 034d1ce · 034d1ce
1 parent 9096da9
commit 034d1ce
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/dfc/httpcommon.go b/dfc/httpcommon.go
@@ -148,6 +148,9 @@ func (h *httprunner) registerhdlr(path string, handler func(http.ResponseWriter,
 		h.mux = http.NewServeMux()
 	}
 	h.mux.HandleFunc(path, handler)
+	if !strings.HasSuffix(path, "/") {
+		h.mux.HandleFunc(path+"/", handler)
+	}
 }
 
 func (h *httprunner) init(s statsif, isproxy bool) {

diff --git a/dfc/proxy.go b/dfc/proxy.go
@@ -177,9 +177,7 @@ func (p *proxyrunner) run() error {
 	}
 
 	p.httprunner.registerhdlr("/"+Rversion+"/"+Rdaemon, p.daemonhdlr)
-	p.httprunner.registerhdlr("/"+Rversion+"/"+Rdaemon+"/", p.daemonhdlr) // FIXME
 	p.httprunner.registerhdlr("/"+Rversion+"/"+Rcluster, p.clusterhdlr)
-	p.httprunner.registerhdlr("/"+Rversion+"/"+Rcluster+"/", p.clusterhdlr) // FIXME
 	p.httprunner.registerhdlr("/"+Rversion+"/"+Rhealth, p.httphealth)
 	p.httprunner.registerhdlr("/"+Rversion+"/"+Rvote+"/", p.votehdlr)
 	p.httprunner.registerhdlr("/"+Rversion+"/"+Rtokens, p.tokenhdlr)
@@ -1380,10 +1378,6 @@ func (p *proxyrunner) daemonhdlr(w http.ResponseWriter, r *http.Request) {
 }
 
 func (p *proxyrunner) httpdaeget(w http.ResponseWriter, r *http.Request) {
-	apitems := p.restAPIItems(r.URL.Path, 5)
-	if apitems = p.checkRestAPI(w, r, apitems, 0, Rversion, Rdaemon); apitems == nil {
-		return
-	}
 	var msg GetMsg
 	if p.readJSON(w, r, &msg) != nil {
 		return
@@ -1403,7 +1397,7 @@ func (p *proxyrunner) httpdaeget(w http.ResponseWriter, r *http.Request) {
 
 	case GetWhatSmapVote:
 		_, xx := p.xactinp.findL(ActElection)
-		vote := (xx != nil)
+		vote := xx != nil
 		msg := SmapVoteMsg{
 			VoteInProgress: vote,
 			Smap:           p.smap.cloneL().(*Smap),
@@ -1620,19 +1614,15 @@ func (p *proxyrunner) tokenhdlr(w http.ResponseWriter, r *http.Request) {
 
 // gets target info
 func (p *proxyrunner) httpcluget(w http.ResponseWriter, r *http.Request) {
-	apitems := p.restAPIItems(r.URL.Path, 5)
-	if apitems = p.checkRestAPI(w, r, apitems, 0, Rversion, Rcluster); apitems == nil {
-		return
-	}
 	var msg GetMsg
 	if p.readJSON(w, r, &msg) != nil {
 		return
 	}
 	switch msg.GetWhat {
 	case GetWhatStats:
-		getstatsmsg, err := json.Marshal(msg) // same message to all targets
+		getStatsMsg, err := json.Marshal(msg) // same message to all targets
 		assert(err == nil, err)
-		p.httpclugetstats(w, r, getstatsmsg)
+		p.httpclugetstats(w, r, getStatsMsg)
 	default:
 		s := fmt.Sprintf("Unexpected GetMsg <- JSON [%v]", msg)
 		p.invalmsghdlr(w, r, s)

diff --git a/dfc/target.go b/dfc/target.go
@@ -139,7 +139,6 @@ func (t *targetrunner) run() error {
 	t.httprunner.registerhdlr("/"+Rversion+"/"+Rbuckets+"/", t.buckethdlr)
 	t.httprunner.registerhdlr("/"+Rversion+"/"+Robjects+"/", t.objecthdlr)
 	t.httprunner.registerhdlr("/"+Rversion+"/"+Rdaemon, t.daemonhdlr)
-	t.httprunner.registerhdlr("/"+Rversion+"/"+Rdaemon+"/", t.daemonhdlr) // FIXME
 	t.httprunner.registerhdlr("/"+Rversion+"/"+Rpush+"/", t.pushhdlr)
 	t.httprunner.registerhdlr("/"+Rversion+"/"+Rhealth, t.httphealth)
 	t.httprunner.registerhdlr("/"+Rversion+"/"+Rvote+"/", t.votehdlr)