github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #368 from Random-Liu/not-log-output

Browse Source 
Do not log container output in error log.
This commit is contained in:
Lantao Liu 2017-10-28 05:50:14 +02:00 committed by GitHub
commit 1d14c11dcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/server/io/logger.go
View File

@ -83,7 +83,7 @@ func redirectLogs(path string, rc io.ReadCloser, wc io.WriteCloser, stream Strea
data := bytes.Join([][]byte{timestampBytes, streamBytes, lineBytes}, delimiterBytes) data := bytes.Join([][]byte{timestampBytes, streamBytes, lineBytes}, delimiterBytes)
data = append(data, eol) data = append(data, eol)
if _, err := wc.Write(data); err != nil { if _, err := wc.Write(data); err != nil {
glog.Errorf("Fail to write log line %q: %v", data, err) glog.Errorf("Fail to write %q log to log file %q: %v", stream, path, err)
} }
// Continue on write error to drain the input. // Continue on write error to drain the input.
} }

2
test/e2e_node/init.yaml
View File

@ -69,7 +69,7 @@ write_files:
Restart=always Restart=always
RestartSec=5 RestartSec=5
ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \ ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \
--alsologtostderr --v=4 \ --logtostderr --v=4 \
--network-bin-dir=/home/cri-containerd/opt/cni/bin \ --network-bin-dir=/home/cri-containerd/opt/cni/bin \
--network-conf-dir=/home/cri-containerd/etc/cni/net.d --network-conf-dir=/home/cri-containerd/etc/cni/net.d