Skip to content

K
k3s
Commit dab13823 authored by Sean Clemmer's avatar Sean Clemmer
Browse files
Options

Use local JSON log buffer in parseDockerJSONLog.

parent 6a0d3c74
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
pkg/kubelet/kuberuntime/kuberuntime_logs.go
View file @ dab13823
...@@ -280,16 +280,14 @@ func parseCRILog(log []byte, msg *logMessage) error { ...@@ -280,16 +280,14 @@ func parseCRILog(log []byte, msg *logMessage) error {
return nil return nil
} }
// dockerJSONLog is the JSON log buffer used in parseDockerJSONLog.
var dockerJSONLog = &jsonlog.JSONLog{}
// parseDockerJSONLog parses logs in Docker JSON log format. Docker JSON log format // parseDockerJSONLog parses logs in Docker JSON log format. Docker JSON log format
// example: // example:
// {"log":"content 1","stream":"stdout","time":"2016-10-20T18:39:20.57606443Z"} // {"log":"content 1","stream":"stdout","time":"2016-10-20T18:39:20.57606443Z"}
// {"log":"content 2","stream":"stderr","time":"2016-10-20T18:39:20.57606444Z"} // {"log":"content 2","stream":"stderr","time":"2016-10-20T18:39:20.57606444Z"}
func parseDockerJSONLog(log []byte, msg *logMessage) error { func parseDockerJSONLog(log []byte, msg *logMessage) error {
dockerJSONLog.Reset() var l = &jsonlog.JSONLog{}
l := dockerJSONLog l.Reset()
// TODO: JSON decoding is fairly expensive, we should evaluate this. // TODO: JSON decoding is fairly expensive, we should evaluate this.
if err := json.Unmarshal(log, l); err != nil { if err := json.Unmarshal(log, l); err != nil {
return fmt.Errorf("failed with %v to unmarshal log %q", err, l) return fmt.Errorf("failed with %v to unmarshal log %q", err, l)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment