libct/logs.ForwardLogs: use bufio.Scanner

Error handling is slightly cleaner this way.

Signed-off-by: Kir Kolyshkin <[email protected]>

libcontainer/logs/logs.go

@@ -26,19 +26,14 @@ type Config struct {
 }
 
 func ForwardLogs(logPipe io.Reader) {
-	lineReader := bufio.NewReader(logPipe)
-	for {
-		line, err := lineReader.ReadBytes('\n')
-		if len(line) > 0 {
-			processEntry(line)
-		}
-		if err == io.EOF {
-			logrus.Debugf("log pipe has been closed: %+v", err)
-			return
-		}
-		if err != nil {
-			logrus.Errorf("log pipe read error: %+v", err)
-		}
+	s := bufio.NewScanner(logPipe)
+	for s.Scan() {
+		processEntry(s.Bytes())
+	}
+	if err := s.Err(); err != nil {
+		logrus.Errorf("log pipe read error: %+v", err)
+	} else {
+		logrus.Debugf("log pipe closed")
 	}
 }
 
@@ -48,6 +43,10 @@ func processEntry(text []byte) {
 		Msg   string `json:"msg"`
 	}
 
+	if len(text) == 0 {
+		return
+	}
+
 	var jl jsonLog
 	if err := json.Unmarshal(text, &jl); err != nil {
 		logrus.Errorf("failed to decode %q to json: %+v", text, err)