Merge pull request moby#38046 from nonspecialist/master

cpuguy83 · web-flow · commit 22dbbcc4c51e · 2018-10-17T10:36:02.000-07:00
Only add CONTAINER_PARTIAL_MESSAGE if not the last partial
diff --git a/daemon/logger/journald/journald.go b/daemon/logger/journald/journald.go
@@ -104,7 +104,7 @@ func (s *journald) Log(msg *logger.Message) error {
 	for k, v := range s.vars {
 		vars[k] = v
 	}
-	if msg.PLogMetaData != nil {
+	if msg.PLogMetaData != nil && !msg.PLogMetaData.Last {
 		vars["CONTAINER_PARTIAL_MESSAGE"] = "true"
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func (s journald) Log(msg logger.Message) error {`
`104`	`104`	`for k, v := range s.vars {`
`105`	`105`	`vars[k] = v`
`106`	`106`	`}`
`107`		`- if msg.PLogMetaData != nil {`
	`107`	`+ if msg.PLogMetaData != nil && !msg.PLogMetaData.Last {`
`108`	`108`	`vars["CONTAINER_PARTIAL_MESSAGE"] = "true"`
`109`	`109`	`}`
`110`	`110`