docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-13 18:22:35 +03:00
Code Activity

Redirect containerd stdout/stderr to the docker stream.

Browse Source 
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 <anusha@docker.com>
Upstream-commit: d9c3b653c0776bdfc4af9129ebbf41160a793cf3
Component: engine
This commit is contained in:
Anusha Ragunathan
2016-03-30 12:25:51 -07:00
parent 9d7bcf25f6
commit 210579a75f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/libcontainerd/remote_linux.go
View File

@@ -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