github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

make local copy of JSONLog

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas 2020-03-10 13:58:42 -04:00
parent 307bafb860
commit 0c52ffe08f
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubelet/kuberuntime/logs/logs.go
View File

@ -29,7 +29,6 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog"
"github.com/fsnotify/fsnotify" "github.com/fsnotify/fsnotify"
"k8s.io/klog" "k8s.io/klog"
@ -165,13 +164,24 @@ func parseCRILog(log []byte, msg *logMessage) error {
return nil return nil
} }
// jsonLog is a log message, typically a single entry from a given log stream.
// since the data structure is originally from docker, we should be careful to
// with any changes to jsonLog
type jsonLog struct {
// Log is the log message
Log string `json:"log,omitempty"`
// Stream is the log source
Stream string `json:"stream,omitempty"`
// Created is the created timestamp of log
Created time.Time `json:"time"`
}
// 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 {
var l = &jsonlog.JSONLog{} var l = &jsonLog{}
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 {