Skip to content

Commit

Permalink
Merge pull request #762 from rjnagal/docker
Browse files Browse the repository at this point in the history
Make graceful degradation of OOM events clearer.
  • Loading branch information
vmarmol committed Jun 9, 2015
2 parents b1be2a0 + a449977 commit c2f6049
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion manager/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ func (self *manager) Start() error {
// Watch for OOMs.
err = self.watchForNewOoms()
if err != nil {
glog.Errorf("Failed to start OOM watcher, will not get OOM events: %v", err)
glog.Warningf("Could not configure a source for OOM detection, disabling OOM events: %v", err)
}

// If there are no factories, don't start any housekeeping and serve the information we do have.
Expand Down

0 comments on commit c2f6049

Please sign in to comment.