prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #541 from kateknister/master

Browse Source 
disabling oomparser due to CPU usage
This commit is contained in:
Victor Marmol 2015-02-26 19:24:22 -08:00
commit e89739e05a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manager/manager.go
View File

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