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

Merge pull request #1252 from sjenning/prefer-systemd

Browse Source 
prefer using systemd for oom monitoring
This commit is contained in:
Tim St. Clair 2016-05-02 11:50:53 -07:00
commit ee5bad8d84
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/oomparser/oomparser.go
View File

@ -205,13 +205,17 @@ func getSystemFile() (string, error) {
// initializes an OomParser object and calls getSystemFile to set the systemFile // initializes an OomParser object and calls getSystemFile to set the systemFile
// attribute. Returns and OomParser object and an error // attribute. Returns and OomParser object and an error
func New() (*OomParser, error) { func New() (*OomParser, error) {
parser, err := trySystemd()
if err == nil {
return parser, nil
}
systemFile, err := getSystemFile() systemFile, err := getSystemFile()
if err != nil { if err != nil {
return trySystemd() return nil, err
} }
file, err := os.Open(systemFile) file, err := os.Open(systemFile)
if err != nil { if err != nil {
return trySystemd() return nil, err
} }
return &OomParser{ return &OomParser{
ioreader: bufio.NewReader(file), ioreader: bufio.NewReader(file),