github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 21:25:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25698 from euank/update-log-stuff

Browse Source 
rkt: Don't warn on empty pod logs
This commit is contained in:
Mike Danese
2016-05-20 15:03:20 -07:00
parent 06b9b35008 3e00e0cd71
commit ae7809d71a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubelet/rkt/log.go
View File

@@ -18,6 +18,7 @@ package rkt
import ( import (
"bufio" "bufio"
"bytes"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
@@ -40,6 +41,8 @@ const (
journalSinceLayout = "2006-01-02 15:04:05" journalSinceLayout = "2006-01-02 15:04:05"
) )
var journalNoEntriesLine = []byte(`"-- No entries --"`)
// pipeLog reads and parses the journal json object from r, // pipeLog reads and parses the journal json object from r,
// and writes the logs line by line to w. // and writes the logs line by line to w.
func pipeLog(wg *sync.WaitGroup, logOptions *api.PodLogOptions, r io.ReadCloser, w io.Writer) { func pipeLog(wg *sync.WaitGroup, logOptions *api.PodLogOptions, r io.ReadCloser, w io.Writer) {
@@ -52,9 +55,12 @@ func pipeLog(wg *sync.WaitGroup, logOptions *api.PodLogOptions, r io.ReadCloser,
for scanner.Scan() { for scanner.Scan() {
var data interface{} var data interface{}
b := scanner.Bytes() b := scanner.Bytes()
if bytes.Equal(b, journalNoEntriesLine) {
continue
}
if err := json.Unmarshal(b, &data); err != nil { if err := json.Unmarshal(b, &data); err != nil {
glog.Warningf("rkt: Cannot unmarshal journal log, skipping line: %v", err) glog.Warningf("rkt: Cannot unmarshal journal log %q, skipping line: %v", string(b), err)
continue continue
} }
@@ -142,6 +148,7 @@ func (r *Runtime) GetContainerLogs(pod *api.Pod, containerID kubecontainer.Conta
} }
} }
glog.V(4).Infof("rkt: gettings logs with command %q", cmd.Args)
outPipe, err := cmd.StdoutPipe() outPipe, err := cmd.StdoutPipe()
if err != nil { if err != nil {
glog.Errorf("rkt: cannot create pipe for journalctl's stdout: %v", err) glog.Errorf("rkt: cannot create pipe for journalctl's stdout: %v", err)