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

Merge pull request #2770 from Random-Liu/partial-revert-#2748

Browse Source 
Partially revert the event discard change in #2748.
This commit is contained in:
Michael Crosby 2018-11-09 15:57:33 -05:00 committed by GitHub
commit 96d30788e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/v1/shim/reaper.go
View File

@ -26,7 +26,6 @@ import (
"github.com/containerd/containerd/sys" "github.com/containerd/containerd/sys"
runc "github.com/containerd/go-runc" runc "github.com/containerd/go-runc"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus"
) )
// ErrNoSuchProcess is returned when the process no longer exists // ErrNoSuchProcess is returned when the process no longer exists
@ -42,18 +41,10 @@ func Reap() error {
Default.Lock() Default.Lock()
for c := range Default.subscribers { for c := range Default.subscribers {
for _, e := range exits { for _, e := range exits {
select { c <- runc.Exit{
case c <- runc.Exit{
Timestamp: now, Timestamp: now,
Pid: e.Pid, Pid: e.Pid,
Status: e.Status, Status: e.Status,
}:
default:
logrus.WithFields(logrus.Fields{
"subscriber": c,
"pid": e.Pid,
"status": e.Status,
}).Warn("failed to send exit to subscriber")
} }
} }
} }