Merge pull request #887 from Snorch/fix-for-custom-cgroup-mounting

Make getCgroupPath work in case of named or multi- hierarchies
This commit is contained in:
Jimmi Dyson 2015-09-30 17:31:32 +01:00
commit fba0608527

View File

@ -42,7 +42,7 @@ import (
// Housekeeping interval.
var HousekeepingInterval = flag.Duration("housekeeping_interval", 1*time.Second, "Interval between container housekeepings")
var cgroupPathRegExp = regexp.MustCompile(".*devices:(.*?)[,;$].*")
var cgroupPathRegExp = regexp.MustCompile(".*devices.*:(.*?)[,;$].*")
// Decay value used for load average smoothing. Interval length of 10 seconds is used.
var loadDecay = math.Exp(float64(-1 * (*HousekeepingInterval).Seconds() / 10))