Merge pull request #7987 from jwhonce/jira/run-898-5

Restore --format table support

1 files changed, 9 insertions, 6 deletions

diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go
index a729b84d4..f74491a8f 100644
--- a/pkg/api/handlers/compat/events.go
+++ b/pkg/api/handlers/compat/events.go
@@ -112,11 +112,15 @@ func GetEvents(w http.ResponseWriter, r *http.Request) {
 		errorChannel <- runtime.Events(r.Context(), readOpts)
 	}()
 
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
+	var flush = func() {}
 	if flusher, ok := w.(http.Flusher); ok {
-		flusher.Flush()
+		flush = flusher.Flush
 	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+	flush()
+
 	coder := json.NewEncoder(w)
 	coder.SetEscapeHTML(true)
 
@@ -124,6 +128,7 @@ func GetEvents(w http.ResponseWriter, r *http.Request) {
 		select {
 		case err := <-errorChannel:
 			if err != nil {
+				// FIXME StatusOK already sent above cannot send 500 here
 				utils.InternalServerError(w, err)
 				return
 			}
@@ -136,9 +141,7 @@ func GetEvents(w http.ResponseWriter, r *http.Request) {
 			if err := coder.Encode(e); err != nil {
 				logrus.Errorf("unable to write json: %q", err)
 			}
-			if flusher, ok := w.(http.Flusher); ok {
-				flusher.Flush()
-			}
+			flush()
 		case <-r.Context().Done():
 			return
 		}