mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #267 from xiangli-cmu/fix-wait-handler

Browse Source 
fix wait handler should close connection if client leaves
This commit is contained in:
Ben Johnson
2013-10-23 13:33:11 -07:00
parent 378c3d1dcf 63456b5c4b
commit e40bb2e8d8
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/v2/get_handler.go
View File

@ -46,11 +46,19 @@ func GetHandler(w http.ResponseWriter, req *http.Request, s Server) error {
} }
// Start the watcher on the store. // Start the watcher on the store.
c, err := s.Store().Watch(key, recursive, sinceIndex, s.CommitIndex(), s.Term()) eventChan, err := s.Store().Watch(key, recursive, sinceIndex, s.CommitIndex(), s.Term())
if err != nil { if err != nil {
return etcdErr.NewError(500, key, store.UndefIndex, store.UndefTerm) return etcdErr.NewError(500, key, store.UndefIndex, store.UndefTerm)
} }
event = <-c
cn, _ := w.(http.CloseNotifier)
closeChan := cn.CloseNotify()
select {
case <-closeChan:
return nil
case event = <-eventChan:
}
} else { //get } else { //get
// Retrieve the key from the store. // Retrieve the key from the store.