From 5b924dfd4e26553aaa7b36eddbac4a63b8198c73 Mon Sep 17 00:00:00 2001 From: Cenk Alti Date: Fri, 10 Jan 2014 15:09:35 +0200 Subject: [PATCH] feat(stream watchers) disable double chunking --- server/v2/get_handler.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/v2/get_handler.go b/server/v2/get_handler.go index 270193d77..23549e47d 100644 --- a/server/v2/get_handler.go +++ b/server/v2/get_handler.go @@ -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 }