From d9c3b653c0776bdfc4af9129ebbf41160a793cf3 Mon Sep 17 00:00:00 2001 From: Anusha Ragunathan Date: Wed, 30 Mar 2016 12:25:51 -0700 Subject: [PATCH] Redirect containerd stdout/stderr to the docker stream. Its useful to have containerd logs as part of docker. Containerd metrics are too chatty, so set interval to 0. Signed-off-by: Anusha Ragunathan --- libcontainerd/remote_linux.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libcontainerd/remote_linux.go b/libcontainerd/remote_linux.go index 4470b3e6a8..58dc4223b4 100644 --- a/libcontainerd/remote_linux.go +++ b/libcontainerd/remote_linux.go @@ -342,7 +342,7 @@ func (r *remote) runContainerdDaemon() error { // Start a new instance args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc"} if r.debugLog { - args = append(args, "--debug") + args = append(args, "--debug", "--metrics-interval=0") } if len(r.runtimeArgs) > 0 { for _, v := range r.runtimeArgs { @@ -352,7 +352,9 @@ func (r *remote) runContainerdDaemon() error { logrus.Debugf("runContainerdDaemon: runtimeArgs: %s", args) } cmd := exec.Command(containerdBinary, args...) - // TODO: store logs? + // redirect containerd logs to docker logs + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true} if err := cmd.Start(); err != nil { return err