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

feat(stream watchers) disable double chunking

Browse Source
This commit is contained in:
Cenk Alti 2014-01-10 15:09:35 +02:00
parent 629a827ee2
commit 5b924dfd4e
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/v2/get_handler.go
View File

@ -4,7 +4,6 @@ import (
"encoding/json"
"fmt"
"net/http"
"net/http/httputil"
"net/url"
"strconv"
@ -74,11 +73,9 @@ func handleWatch(key string, recursive, stream bool, waitIndex string, w http.Re
// watcher hub will not help to remove stream watcher
// so we need to remove here
defer watcher.Remove()
chunkWriter := httputil.NewChunkedWriter(w)
for {
select {
case <-closeChan:
chunkWriter.Close()
return nil
case event, ok := <-watcher.EventChan:
if !ok {
@ -89,7 +86,7 @@ func handleWatch(key string, recursive, stream bool, waitIndex string, w http.Re
}
b, _ := json.Marshal(event)
_, err := chunkWriter.Write(b)
_, err := w.Write(b)
if err != nil {
return nil
}