Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Xiang Li
2013-10-14 21:22:20 -07:00
parent 3f896cf586
commit 811d172a54
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/v2/get_key_handler.go
View File

@@ -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)
} }