vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #619 from crosbymichael/no-shim

Browse source 
Add `no_shim` config for not running with a shim
This commit is contained in:
Michael Crosby 2017-03-22 13:49:03 -07:00 • committed by GitHub
commit 5e5479718c
9 changed files with 199 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/containerd/main.go
View file

@ -409,7 +409,7 @@ func handleSignals(signals chan os.Signal, server *grpc.Server) error {
log.G(global).WithField("signal", s).Debug("received signal")
switch s {
case syscall.SIGCHLD:
if _, err := reaper.Reap(); err != nil {
if err := reaper.Reap(); err != nil {
log.G(global).WithError(err).Error("reap containerd processes")
}
default: