From 2b7d5b5bf0cf1b0dfa212b8cbc4ad3940e551e68 Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Thu, 5 Dec 2013 20:24:54 -0500 Subject: [PATCH] simplify routing, rm addremove.go will implement a full rest API later --- server/addremove.go | 17 ----------------- server/server.go | 15 +++------------ 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 server/addremove.go diff --git a/server/addremove.go b/server/addremove.go deleted file mode 100644 index 560d485..0000000 --- a/server/addremove.go +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2013 The Chihaya Authors. All rights reserved. -// Use of this source code is governed by the BSD 2-Clause license, -// which can be found in the LICENSE file. - -package server - -import ( - "net/http" -) - -func (s Server) serveAdd(w http.ResponseWriter, r *http.Request) { - return -} - -func (s Server) serveRemove(w http.ResponseWriter, r *http.Request) { - return -} diff --git a/server/server.go b/server/server.go index 1b9e3ae..af869c6 100644 --- a/server/server.go +++ b/server/server.go @@ -83,18 +83,6 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { defer atomic.AddInt64(&s.deltaRequests, 1) r.Close = true - switch r.URL.Path { - case "/stats": - s.serveStats(w, r) - return - case "/add": - s.serveAdd(w, r) - return - case "/remove": - s.serveRemove(w, r) - return - } - _, action := path.Split(r.URL.Path) switch action { case "announce": @@ -103,6 +91,9 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { case "scrape": s.serveScrape(w, r) return + case "stats": + s.serveStats(w, r) + return default: fail(errors.New("Unknown action"), w, r) return