init cancel watcher

server/v2/get_handler.go

@@ -55,7 +55,7 @@ func GetHandler(w http.ResponseWriter, req *http.Request, s Server) error {
 		}
 
 		// Start the watcher on the store.
-		eventChan, err := s.Store().Watch(key, recursive, sinceIndex)
+		watcher, err := s.Store().NewWatcher(key, recursive, sinceIndex)
 		if err != nil {
 			return etcdErr.NewError(500, key, s.Store().Index())
 		}
@@ -65,8 +65,9 @@ func GetHandler(w http.ResponseWriter, req *http.Request, s Server) error {
 
 		select {
 		case <-closeChan:
+			watcher.Remove()
 			return nil
-		case event = <-eventChan:
+		case event = <-watcher.EventChan:
 		}
 
 	} else { //get