Merge pull request #2471 from crosbymichael/fatal

Don't fatal on epoll wait
2018-07-23 14:17:57 -07:00
parent 88ec4559b6 9743ff21c9
commit a88b631961
1 changed files with 2 additions and 1 deletions
--- a/metrics/cgroups/oom.go
+++ b/metrics/cgroups/oom.go
@@ -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)