Interpret EOF as line end in log data_listener

Author: anahan

internal/applog/data_listener.go

@@ -41,7 +41,7 @@ func (l *DataListener) handleConnection(conn net.Conn) {
 	defer l.rPool.Put(reader)
 
 	for {
-		buf, err := line.ReadOne(reader)
+		buf, err := line.ReadOne(reader, true)
 		if err != nil {
 			if err != io.EOF {
 				l.errorChan <- err

pkg/line/read.go

@@ -6,13 +6,17 @@ import (
 	"io"
 )
 
-func ReadOne(r *bufio.Reader) ([]byte, error) {
+func ReadOne(r *bufio.Reader, retBufOnEOF bool) ([]byte, error) {
 	skip := false
 
 	for {
 		line, err := r.ReadSlice('\n')
 
 		if errors.Is(err, io.EOF) {
+			if retBufOnEOF {
+				return line, nil
+			}
+
 			return nil, err
 		}
 

pkg/line/read_test.go

@@ -12,7 +12,7 @@ import (
 func tf(t *testing.T, in string, out []byte, expectedErr error) {
 	r := bufio.NewReaderSize(bytes.NewBufferString(in), 16)
 
-	line, err := ReadOne(r)
+	line, err := ReadOne(r, false)
 	assert.Equal(t, expectedErr, err)
 	assert.Equal(t, out, line)
 }

pkg/phpfpm/errlog_parser.go

@@ -30,7 +30,7 @@ var errLogEntryRegexp = regexp.MustCompile(`^\[([^]]+)]\s+(ALERT|ERROR|WARNING|N
 
 func (p *ErrLogParser) ParseOne(r *bufio.Reader) (ErrLogEntry, error) {
 	result := ErrLogEntry{}
-	buf, err := line.ReadOne(r)
+	buf, err := line.ReadOne(r, false)
 	if err != nil {
 		return result, err
 	}

pkg/phpfpm/slowlog_parser.go

@@ -135,7 +135,7 @@ func (slp *SlowlogParser) Parse(ctx context.Context, r io.Reader, out chan Slowl
 		bufioReader := bufio.NewReader(r)
 
 		for {
-			buf, err := line.ReadOne(bufioReader)
+			buf, err := line.ReadOne(bufioReader, false)
 			if err != nil {
 				errCh <- err