opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 09:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2513 from mheon/log_timestamps_newline

Browse Source 
Ensure that each log line is newline-terminated
This commit is contained in:
OpenShift Merge Robot
2019-03-04 08:38:18 -08:00
committed by GitHub
parent 54eecb02f0 ff609a5ade
commit 34bf58c5db
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/logs/logs.go
View File

@ -277,10 +277,11 @@ func readLog(reader *bufio.Reader, opts *LogOptions) []string {
// logWriter controls the writing into the stream based on the log options. // logWriter controls the writing into the stream based on the log options.
type logWriter struct { type logWriter struct {
stdout io.Writer stdout io.Writer
stderr io.Writer stderr io.Writer
opts *LogOptions opts *LogOptions
remain int64 remain int64
doAppend bool
} }
// errMaximumWrite is returned when all bytes have been written. // errMaximumWrite is returned when all bytes have been written.
@ -309,9 +310,15 @@ func (w *logWriter) write(msg *logMessage) error {
return nil return nil
} }
line := msg.log line := msg.log
if w.opts.Timestamps { if w.opts.Timestamps && !w.doAppend {
prefix := append([]byte(msg.timestamp.Format(timeFormat)), delimiter[0]) prefix := append([]byte(msg.timestamp.Format(timeFormat)), delimiter[0])
line = append(prefix, line...) line = append(prefix, line...)
if len(line) > 0 && line[len(line)-1] != '\n' {
w.doAppend = true
}
}
if w.doAppend && len(line) > 0 && line[len(line)-1] == '\n' {
w.doAppend = false
} }
// If the line is longer than the remaining bytes, cut it. // If the line is longer than the remaining bytes, cut it.
if int64(len(line)) > w.remain { if int64(len(line)) > w.remain {