Merge pull request #2471 from crosbymichael/fatal

Don't fatal on epoll wait
This commit is contained in:
Stephen Day 2018-07-23 14:17:57 -07:00 committed by GitHub
commit a88b631961
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -116,7 +116,8 @@ func (o *oomCollector) start() {
if err == unix.EINTR {
continue
}
logrus.WithField("error", err).Fatal("cgroups: epoll wait")
logrus.WithError(err).Error("cgroups: epoll wait failed, OOM notifications disabled")
return
}
for i := 0; i < n; i++ {
o.process(uintptr(events[i].Fd), events[i].Events)