Merge pull request #2471 from crosbymichael/fatal

stevvooe · web-flow · commit a88b6319614d · 2018-07-23T14:17:57.000-07:00
Don't fatal on epoll wait
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,8 @@ func (o *oomCollector) start() {`
`116`	`116`	`if err == unix.EINTR {`
`117`	`117`	`continue`
`118`	`118`	`}`
`119`		`- logrus.WithField("error", err).Fatal("cgroups: epoll wait")`
	`119`	`+ logrus.WithError(err).Error("cgroups: epoll wait failed, OOM notifications disabled")`
	`120`	`+ return`
`120`	`121`	`}`
`121`	`122`	`for i := 0; i < n; i++ {`
`122`	`123`	`o.process(uintptr(events[i].Fd), events[i].Events)`