Merge pull request #846 from rjnagal/docker

Fix cgroup name parsing logic in ps output for centos6.
This commit is contained in:
Victor Marmol 2015-08-07 21:53:39 -07:00
commit 2a7218e03b

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))