From a3d82ee47fa3f966c727e3c62914bb6a8f63d3bc Mon Sep 17 00:00:00 2001
From: Alex Dadgar <alex.dadgar@gmail.com>
Date: Tue, 5 Jul 2016 23:48:25 -0400
Subject: [PATCH] Flush and use correct buffer size

---
 command/agent/fs_endpoint.go | 11 ++++++-----
 command/agent/http.go        |  3 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/command/agent/fs_endpoint.go b/command/agent/fs_endpoint.go
index 2ed9e5d7a..74a1e09e2 100644
--- a/command/agent/fs_endpoint.go
+++ b/command/agent/fs_endpoint.go
@@ -11,6 +11,7 @@ import (
 
 	"gopkg.in/tomb.v1"
 
+	"github.com/docker/docker/pkg/ioutils"
 	"github.com/ugorji/go/codec"
 )
 
@@ -23,7 +24,7 @@ var (
 
 const (
 	// frameSize is the maximum number of bytes to send in a single frame
-	frameSize = 64 * 1024 * 1024
+	frameSize = 64 * 1024
 
 	// streamHeartbeatRate is the rate at which a heartbeat will occur to detect
 	// a closed connection without sending any additional data
@@ -210,8 +211,11 @@ func (s *HTTPServer) Stream(resp http.ResponseWriter, req *http.Request) (interf
 
 	}
 
+	// Create an output that gets flushed on every write
+	output := ioutils.NewWriteFlusher(resp)
+
 	// Create a JSON encoder
-	enc := codec.NewEncoder(resp, jsonHandle)
+	enc := codec.NewEncoder(output, jsonHandle)
 
 	// Get the reader
 	f, err := fs.ReadAt(path, offset)
@@ -285,8 +289,6 @@ OUTER:
 			case <-changes.Modified:
 				continue OUTER
 			case <-changes.Deleted:
-				s.logger.Println("ALEX: FILE DELTED")
-
 				// Send a heartbeat frame with the delete
 				hFrame := StreamFrame{
 					Offset:    offset,
@@ -329,7 +331,6 @@ OUTER:
 
 				if err := enc.Encode(&hFrame); err != nil {
 					// The defer on the tomb will stop the watch
-					s.logger.Println("ALEX: FRAME FAILED TO ENCODE")
 					return nil, err
 				}
 
diff --git a/command/agent/http.go b/command/agent/http.go
index 98ffd819b..5d6c42aa0 100644
--- a/command/agent/http.go
+++ b/command/agent/http.go
@@ -66,8 +66,7 @@ func NewHTTPServer(agent *Agent, config *Config, logOutput io.Writer) (*HTTPServ
 	srv.registerHandlers(config.EnableDebug)
 
 	// Start the server
-	//go http.Serve(ln, gziphandler.GzipHandler(mux))
-	go http.Serve(ln, mux)
+	go http.Serve(ln, gziphandler.GzipHandler(mux))
 	return srv, nil
 }