Browse Source

fix change wait_index to waitIndex; we do not use post in 0.2

Xiang Li 12 years ago
parent
commit
811d172a54
1 changed files with 5 additions and 3 deletions
  1. 5 3
      server/v2/get_key_handler.go

+ 5 - 3
server/v2/get_key_handler.go

@@ -25,7 +25,7 @@ func GetKeyHandler(w http.ResponseWriter, req *http.Request, s Server) error {
 		leader := s.Leader()
 		leader := s.Leader()
 		hostname, _ := s.PeerURL(leader)
 		hostname, _ := s.PeerURL(leader)
 		url := hostname + req.URL.Path
 		url := hostname + req.URL.Path
-		log.Debugf("Redirect to %s", url)
+		log.Debugf("Redirect consistent get to %s", url)
 		http.Redirect(w, req, url, http.StatusTemporaryRedirect)
 		http.Redirect(w, req, url, http.StatusTemporaryRedirect)
 		return nil
 		return nil
 	}
 	}
@@ -36,8 +36,10 @@ func GetKeyHandler(w http.ResponseWriter, req *http.Request, s Server) error {
 	if req.FormValue("wait") == "true" { // watch
 	if req.FormValue("wait") == "true" { // watch
 		// Create a command to watch from a given index (default 0).
 		// Create a command to watch from a given index (default 0).
 		var sinceIndex uint64 = 0
 		var sinceIndex uint64 = 0
-		if req.Method == "POST" {
-			sinceIndex, err = strconv.ParseUint(string(req.FormValue("wait_index")), 10, 64)
+
+		waitIndex := req.FormValue("waitIndex")
+		if waitIndex != "" {
+			sinceIndex, err = strconv.ParseUint(string(req.FormValue("waitIndex")), 10, 64)
 			if err != nil {
 			if err != nil {
 				return etcdErr.NewError(etcdErr.EcodeIndexNaN, "Watch From Index", store.UndefIndex, store.UndefTerm)
 				return etcdErr.NewError(etcdErr.EcodeIndexNaN, "Watch From Index", store.UndefIndex, store.UndefTerm)
 			}
 			}