Merge pull request #8083 from crunchtime-ali/add-eol-to-compat-log

Add EOL to compat container logs
containers · Oct 21, 2020 · 61b276a · 61b276a
2 parents a1b942f + b26c651
commit 61b276a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/api/handlers/compat/containers_logs.go b/pkg/api/handlers/compat/containers_logs.go
@@ -148,7 +148,13 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) {
 			frame.WriteString(line.Time.Format(time.RFC3339))
 			frame.WriteString(" ")
 		}
+
 		frame.WriteString(line.Msg)
+		// Log lines in the compat layer require adding EOL
+		// https://github.com/containers/podman/issues/8058
+		if !utils.IsLibpodRequest(r) {
+			frame.WriteString("\n")
+		}
 
 		if writeHeader {
 			binary.BigEndian.PutUint32(header[4:], uint32(frame.Len()))