From a963ff5d8df4e6d0e42dd669d3d60aafb8f880a7 Mon Sep 17 00:00:00 2001 From: Dan Hirsch Date: Fri, 1 Nov 2013 13:11:21 -0400 Subject: [PATCH] Added explicit Flush method to utils.WriteFlusher --- api.go | 10 +++++----- utils/utils.go | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/api.go b/api.go index 517fe59923..44e83349ca 100644 --- a/api.go +++ b/api.go @@ -72,12 +72,12 @@ func httpError(w http.ResponseWriter, err error) { statusCode = http.StatusUnauthorized } else if strings.Contains(err.Error(), "hasn't been activated") { statusCode = http.StatusForbidden - } - + } + if err != nil { utils.Errorf("HTTP Error: statusCode=%d %s", statusCode, err.Error()) - http.Error(w, err.Error(), statusCode) - } + http.Error(w, err.Error(), statusCode) + } } func writeJSON(w http.ResponseWriter, code int, v interface{}) error { @@ -236,7 +236,7 @@ func getEvents(srv *Server, version float64, w http.ResponseWriter, r *http.Requ } w.Header().Set("Content-Type", "application/json") wf := utils.NewWriteFlusher(w) - wf.Write([]byte{}) + wf.Flush() if since != 0 { // If since, send previous events that happened after the timestamp for _, event := range srv.events { diff --git a/utils/utils.go b/utils/utils.go index 389203b985..a90f4e9f06 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -616,6 +616,13 @@ func (wf *WriteFlusher) Write(b []byte) (n int, err error) { return n, err } +// Flush the stream immediately. +func (wf *WriteFlusher) Flush() { + wf.Lock() + defer wf.Unlock() + wf.flusher.Flush() +} + func NewWriteFlusher(w io.Writer) *WriteFlusher { var flusher http.Flusher if f, ok := w.(http.Flusher); ok {