kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases 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>
This commit is contained in:
Anusha Ragunathan 2016-03-30 12:25:51 -07:00
parent eaf138af1f
commit d9c3b653c0
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libcontainerd/remote_linux.go
View file

@ -342,7 +342,7 @@ func (r *remote) runContainerdDaemon() error {
// Start a new instance // Start a new instance
args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc"} args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc"}
if r.debugLog { if r.debugLog {
args = append(args, "--debug") args = append(args, "--debug", "--metrics-interval=0")
} }
if len(r.runtimeArgs) > 0 { if len(r.runtimeArgs) > 0 {
for _, v := range r.runtimeArgs { for _, v := range r.runtimeArgs {
@ -352,7 +352,9 @@ func (r *remote) runContainerdDaemon() error {
logrus.Debugf("runContainerdDaemon: runtimeArgs: %s", args) logrus.Debugf("runContainerdDaemon: runtimeArgs: %s", args)
} }
cmd := exec.Command(containerdBinary, 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} cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
return err return err