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

Merge pull request #3276 from darfux/v1_respect_shim_debug

Browse Source 
v1:Respect the `shim_debug` flag when load tasks
This commit is contained in:
Michael Crosby 2019-05-13 13:02:32 -04:00 committed by GitHub
commit 7acdb16882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/v1/linux/runtime.go
View File

@ -372,7 +372,11 @@ func (r *Runtime) loadTasks(ctx context.Context, ns string) ([]*Task, error) {
}).Error("opening shim stdout log pipe") }).Error("opening shim stdout log pipe")
continue continue
} }
go io.Copy(os.Stdout, shimStdoutLog) if r.config.ShimDebug {
go io.Copy(os.Stdout, shimStdoutLog)
} else {
go io.Copy(ioutil.Discard, shimStdoutLog)
}
shimStderrLog, err := v1.OpenShimStderrLog(ctx, logDirPath) shimStderrLog, err := v1.OpenShimStderrLog(ctx, logDirPath)
if err != nil { if err != nil {
@ -383,7 +387,11 @@ func (r *Runtime) loadTasks(ctx context.Context, ns string) ([]*Task, error) {
}).Error("opening shim stderr log pipe") }).Error("opening shim stderr log pipe")
continue continue
} }
go io.Copy(os.Stderr, shimStderrLog) if r.config.ShimDebug {
go io.Copy(os.Stderr, shimStderrLog)
} else {
go io.Copy(ioutil.Discard, shimStderrLog)
}
t, err := newTask(id, ns, pid, s, r.events, r.tasks, bundle) t, err := newTask(id, ns, pid, s, r.events, r.tasks, bundle)
if err != nil { if err != nil {