Merge pull request #530 from vmarmol/fix

Don't fail startup if OOM watching failed.
This commit is contained in:
Victor Marmol 2015-02-23 12:52:36 -08:00
commit 196c877ee4

View File

@ -177,7 +177,7 @@ func (self *manager) Start() error {
self.quitChannels = append(self.quitChannels, quitWatcher)
err = self.watchForNewOoms()
if err != nil {
return err
glog.Errorf("Failed to start OOM watcher, will not get OOM events: %v", err)
}
// Look for new containers in the main housekeeping thread.