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

Merge pull request #960 from vishh/no-systemd

Browse Source 
Add a `--nosystemd` flag
This commit is contained in:
Jimmi Dyson 2015-11-23 09:19:19 +00:00
commit edd537e47a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
container/docker/factory.go
View File

@ -46,6 +46,8 @@ var dockerRunDir = flag.String("docker_run", "/var/run/docker", "Absolute path t
// --cgroup-parent have another prefix than 'docker' // --cgroup-parent have another prefix than 'docker'
var dockerCgroupRegexp = regexp.MustCompile(`.+-([a-z0-9]{64})\.scope$`) var dockerCgroupRegexp = regexp.MustCompile(`.+-([a-z0-9]{64})\.scope$`)
var noSystemd = flag.Bool("nosystemd", false, "Explicitly disable systemd support for Docker containers")
// TODO(vmarmol): Export run dir too for newer Dockers. // TODO(vmarmol): Export run dir too for newer Dockers.
// Directory holding Docker container state information. // Directory holding Docker container state information.
func DockerStateDir() string { func DockerStateDir() string {
@ -53,13 +55,14 @@ func DockerStateDir() string {
} }
// Whether the system is using Systemd. // Whether the system is using Systemd.
var useSystemd bool var useSystemd = false
var check = sync.Once{} var check = sync.Once{}
func UseSystemd() bool { func UseSystemd() bool {
check.Do(func() { check.Do(func() {
useSystemd = false if *noSystemd {
return
}
// Check for system.slice in systemd and cpu cgroup. // Check for system.slice in systemd and cpu cgroup.
for _, cgroupType := range []string{"name=systemd", "cpu"} { for _, cgroupType := range []string{"name=systemd", "cpu"} {
mnt, err := cgroups.FindCgroupMountpoint(cgroupType) mnt, err := cgroups.FindCgroupMountpoint(cgroupType)