Merge pull request #1855 from mfojtik/verbose

Make Kubernetes startup less noisy
pull/6/head
Clayton Coleman 2014-10-20 10:30:45 -04:00
commit d5377e4a39
2 changed files with 4 additions and 3 deletions

View File

@ -22,6 +22,7 @@ import (
"hash/adler32"
"io"
"math/rand"
"os"
"os/exec"
"sort"
"strconv"
@ -82,8 +83,8 @@ func NewDockerPuller(client DockerInterface, qps float32, burst int) DockerPulle
cfg, err := readDockerConfigFile()
if err == nil {
cfg.addToKeyring(dp.keyring)
} else {
glog.Errorf("Unable to parse Docker config file: %v", err)
} else if !os.IsNotExist(err) {
glog.V(1).Infof("Unable to parse Docker config file: %v", err)
}
if dp.keyring.count() == 0 {

View File

@ -75,7 +75,7 @@ func (r *HealthyRegistry) ListMinions(ctx api.Context) (currentMinions *api.Mini
for _, minion := range list.Items {
status, err := health.DoHTTPCheck(r.makeMinionURL(minion.ID), r.client)
if err != nil {
glog.Errorf("%#v failed health check with error: %s", minion, err)
glog.V(1).Infof("%#v failed health check with error: %s", minion, err)
continue
}
if status == health.Healthy {