kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

dockerd: force HTTP flush at each write (aka poor man's streaming)

Browse source
This commit is contained in:
Solomon Hykes 2013-01-19 18:23:33 -08:00
parent 8a28efa655
commit f90183e957
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dockerd/dockerd.go
View file

@ -160,6 +160,18 @@ func main() {
} }
} }
type AutoFlush struct {
http.ResponseWriter
}
func (w *AutoFlush) Write(data []byte) (int, error) {
ret, err := w.ResponseWriter.Write(data)
if flusher, ok := w.ResponseWriter.(http.Flusher); ok {
flusher.Flush()
}
return ret, err
}
func (docker *Docker) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (docker *Docker) ServeHTTP(w http.ResponseWriter, r *http.Request) {
cmd, args := URLToCall(r.URL) cmd, args := URLToCall(r.URL)
log.Printf("%s\n", strings.Join(append(append([]string{"docker"}, cmd), args...), " ")) log.Printf("%s\n", strings.Join(append(append([]string{"docker"}, cmd), args...), " "))
@ -171,7 +183,7 @@ func (docker *Docker) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if method == nil { if method == nil {
docker.CmdUsage(r.Body, w, cmd) docker.CmdUsage(r.Body, w, cmd)
} else { } else {
err := method(r.Body, w, args...) err := method(r.Body, &AutoFlush{w}, args...)
if err != nil { if err != nil {
fmt.Fprintf(w, "Error: %s\n", err) fmt.Fprintf(w, "Error: %s\n", err)
} }