Przeglądaj źródła

Merge pull request #41407 from Sixt/bug-41403

add partial metadata to journald logs
Sebastiaan van Stijn 4 lat temu
rodzic
commit
f50a40e889
1 zmienionych plików z 8 dodań i 2 usunięć
  1. 8 2
      daemon/logger/journald/journald.go

+ 8 - 2
daemon/logger/journald/journald.go

@@ -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 {
-		vars["CONTAINER_PARTIAL_MESSAGE"] = "true"
+	if msg.PLogMetaData != nil {
+		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)