Wait for docker to start cadvisor.

This commit is contained in:
Dawn Chen
2015-05-15 13:24:24 -07:00
parent 43e4654333
commit 85ca8506bb
6 changed files with 24 additions and 5 deletions

View File

@@ -57,10 +57,6 @@ func New(port uint) (Interface, error) {
if err != nil {
return nil, err
}
err = m.Start()
if err != nil {
return nil, err
}
cadvisorClient := &cadvisorClient{
Manager: m,
@@ -73,10 +69,13 @@ func New(port uint) (Interface, error) {
return nil, err
}
}
return cadvisorClient, nil
}
func (cc *cadvisorClient) Start() error {
return cc.Manager.Start()
}
func (cc *cadvisorClient) exportHTTP(port uint) error {
mux := http.NewServeMux()
err := cadvisorHttp.RegisterHandlers(mux, cc, "", "", "", "", "/metrics")