Skip to content

Commit

Permalink
Fix cgroup name parsing logic in ps output for centos6.
Browse files Browse the repository at this point in the history
Centos 6 uses a different ps lib resulting in different output.
  • Loading branch information
rjnagal committed Aug 8, 2015
1 parent b0684c2 commit 15664a6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion manager/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 15664a6

Please sign in to comment.