Add back old HTTP flushing functionality

daemon/inertiad/log/routine.go

@@ -3,6 +3,7 @@ package log
 import (
 	"bufio"
 	"io"
+	"net/http"
 )
 
 // FlushRoutine continuously writes everything in given ReadCloser
@@ -13,19 +14,31 @@ ROUTINE:
 	for {
 		select {
 		case <-stop:
-			line, err := reader.ReadBytes('\n')
-			if err == nil {
-				w.Write(line)
-			}
+			WriteAndFlush(w, reader)
 			break ROUTINE
 		default:
 			// Read from pipe then write to ResponseWriter and flush it,
 			// sending the copied content to the client.
-			line, err := reader.ReadBytes('\n')
+			err := WriteAndFlush(w, reader)
 			if err != nil {
 				break ROUTINE
 			}
-			w.Write(line)
 		}
 	}
 }
+
+// WriteAndFlush reads from buffer, writes to writer, and flushes if possible
+func WriteAndFlush(w io.Writer, reader *bufio.Reader) error {
+	line, err := reader.ReadBytes('\n')
+	if err != nil {
+		return err
+	}
+
+	// Write to writer, and flush as well if it is a flusher
+	w.Write(line)
+	if f, ok := w.(http.Flusher); ok {
+		f.Flush()
+	}
+
+	return nil
+}

daemon/inertiad/log/routine_test.go

@@ -1,6 +1,7 @@
 package log
 
 import (
+	"bufio"
 	"fmt"
 	"io"
 	"net/http"
@@ -13,7 +14,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestFlushRoutine(t *testing.T) {
+func TestFlushRoutineWebSocket(t *testing.T) {
 	testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// establish socket connection
 		var upgrader = websocket.Upgrader{}
@@ -82,3 +83,49 @@ func TestFlushRoutine(t *testing.T) {
 		i++
 	}
 }
+
+func TestFlushRoutineHTTP(t *testing.T) {
+	testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		reader, writer := io.Pipe()
+		stop := make(chan struct{})
+		go FlushRoutine(w, reader, stop)
+
+		fmt.Println(writer, "Hello!")
+		time.Sleep(time.Millisecond)
+
+		fmt.Println(writer, "Lunch?")
+		time.Sleep(time.Millisecond)
+
+		fmt.Println(writer, "Bye!")
+		time.Sleep(time.Millisecond)
+
+		close(stop)
+		fmt.Println(writer, "Do I live?")
+	}))
+	defer testServer.Close()
+
+	resp, err := http.DefaultClient.Get(testServer.URL)
+	assert.Nil(t, err)
+
+	reader := bufio.NewReader(resp.Body)
+	i := 0
+	for i < 4 {
+		line, err := reader.ReadBytes('\n')
+		if err != nil {
+			break
+		}
+
+		switch i {
+		case 0:
+			assert.Equal(t, "Hello!", string(line))
+		case 1:
+			assert.Equal(t, "Lunch?", string(line))
+		case 2:
+			assert.Equal(t, "Bye!", string(line))
+		case 3:
+			assert.Equal(t, "", string(line))
+		}
+
+		i++
+	}
+}