From f2fa351a1f976eb86c936b35565c41f716f7a931 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Sat, 28 Oct 2017 02:16:43 +0000 Subject: [PATCH] Do not log container output in error log. Signed-off-by: Lantao Liu --- pkg/server/io/logger.go | 2 +- test/e2e_node/init.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/server/io/logger.go b/pkg/server/io/logger.go index c4628a8f4..4b88d3e52 100644 --- a/pkg/server/io/logger.go +++ b/pkg/server/io/logger.go @@ -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 = append(data, eol) 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. } diff --git a/test/e2e_node/init.yaml b/test/e2e_node/init.yaml index cee95698e..eef701567 100644 --- a/test/e2e_node/init.yaml +++ b/test/e2e_node/init.yaml @@ -69,7 +69,7 @@ write_files: Restart=always RestartSec=5 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-conf-dir=/home/cri-containerd/etc/cni/net.d