kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #41407 from Sixt/bug-41403 

add partial metadata to journald logs
This commit is contained in:
Sebastiaan van Stijn 2020-09-08 12:20:54 +02:00 committed by GitHub
parent ae0ef82b90 322c9e6866
commit f50a40e889
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemon/logger/journald/journald.go
View File

@ -6,6 +6,7 @@ package journald // import "github.com/docker/docker/daemon/logger/journald"
import ( import (
"fmt" "fmt"
"strconv"
"sync" "sync"
"unicode" "unicode"
@ -105,8 +106,13 @@ func (s *journald) Log(msg *logger.Message) error {
for k, v := range s.vars { for k, v := range s.vars {
vars[k] = v vars[k] = v
} }
if msg.PLogMetaData != nil && !msg.PLogMetaData.Last { if msg.PLogMetaData != nil {
vars["CONTAINER_PARTIAL_MESSAGE"] = "true" vars["CONTAINER_PARTIAL_ID"] = msg.PLogMetaData.ID
vars["CONTAINER_PARTIAL_ORDINAL"] = strconv.Itoa(msg.PLogMetaData.Ordinal)
vars["CONTAINER_PARTIAL_LAST"] = strconv.FormatBool(msg.PLogMetaData.Last)
if !msg.PLogMetaData.Last {
vars["CONTAINER_PARTIAL_MESSAGE"] = "true"
}
} }
line := string(msg.Line) line := string(msg.Line)