Merge pull request #19374 from timstclair/housekeep

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-14 01:42:52 -08:00
commit bf315d4563

View File

@ -19,6 +19,7 @@ limitations under the License.
package cadvisor
import (
"flag"
"fmt"
"net/http"
"regexp"
@ -46,8 +47,17 @@ var _ Interface = new(cadvisorClient)
// The amount of time for which to keep stats in memory.
const statsCacheDuration = 2 * time.Minute
const maxHousekeepingInterval = 15 * time.Second
const defaultHousekeepingInterval = 10 * time.Second
const allowDynamicHousekeeping = true
func init() {
// Override the default cAdvisor housekeeping interval.
if f := flag.Lookup("housekeeping_interval"); f != nil {
f.DefValue = defaultHousekeepingInterval.String()
f.Value.Set(f.DefValue)
}
}
// Creates a cAdvisor and exports its API on the specified port if port > 0.
func New(port uint) (Interface, error) {
sysFs, err := sysfs.NewRealSysFs()