containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add EOL to compat container logs 

Signed-off-by: Alexander Zigelski <ali@crunchtime.dev>
This commit is contained in:
Alexander Zigelski 2020-10-20 22:02:01 +02:00 committed by Alexander Zigelski
parent 4822cc8cab
commit b26c6519ac
No known key found for this signature in database
GPG Key ID: 86A4B4210A1EE292
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/handlers/compat/containers_logs.go
View File

@ -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()))