Fix partial log line handling with journald log driver

Patch originally by Paul Holzinger (sourced from [1]). This is necessary to get the tests to pass in order to include a batch of other, related journald fixes in `podman logs`. [1] #12274 (comment) Signed-off-by: Matthew Heon <[email protected]>
containers · Nov 12, 2021 · 6d9b1e4 · 6d9b1e4
1 parent 8b368b5
commit 6d9b1e4
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go
@@ -140,6 +140,7 @@ func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOption
 			doTail = false
 		}
 		lastReadCursor := ""
+		partial := ""
 		for {
 			select {
 			case <-ctx.Done():
@@ -229,6 +230,12 @@ func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOption
 				logrus.Errorf("Failed parse log line: %v", err)
 				return
 			}
+			if logLine.Partial() {
+				partial += logLine.Msg
+				continue
+			}
+			logLine.Msg = partial + logLine.Msg
+			partial = ""
 			if doTail {
 				tailQueue = append(tailQueue, logLine)
 				continue