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

Merge pull request #349 from vmarmol/systemd

Browse Source 
Try to detect systemd by checking for its named cgroup hierarchy.
This commit is contained in:
Vish Kannan 2014-12-12 08:49:22 -08:00
commit 90e407d234
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
container/docker/factory.go
View File

@ -22,6 +22,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/docker/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups/systemd" "github.com/docker/libcontainer/cgroups/systemd"
"github.com/fsouza/go-dockerclient" "github.com/fsouza/go-dockerclient"
"github.com/golang/glog" "github.com/golang/glog"
@ -42,8 +43,10 @@ var useSystemd bool
func init() { func init() {
useSystemd = systemd.UseSystemd() useSystemd = systemd.UseSystemd()
if useSystemd { if !useSystemd {
glog.Infof("System is using systemd") // Second attempt at checking for systemd, check for a "name=systemd" cgroup.
_, err := cgroups.FindCgroupMountpoint("name=systemd")
useSystemd = (err == nil)
} }
} }
@ -200,6 +203,10 @@ func Register(factory info.MachineInfoFactory) error {
} }
} }
if useSystemd {
glog.Infof("System is using systemd")
}
glog.Infof("Registering Docker factory") glog.Infof("Registering Docker factory")
f := &dockerFactory{ f := &dockerFactory{
machineInfoFactory: factory, machineInfoFactory: factory,