github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #214 from thockin/logging

Browse Source 
Remove noisy non-error lines from logs
This commit is contained in:
Daniel Smith 2014-06-23 21:02:35 -07:00
commit e96cfaf115
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubelet/kubelet.go
View File

@ -458,7 +458,9 @@ func (kl *Kubelet) WatchFile(file string, updateChannel chan<- manifestUpdate) {
fileInfo, err := os.Stat(file)
if err != nil {
log.Printf("Error polling file: %#v", err)
if !os.IsNotExist(err) {
log.Printf("Error polling file: %#v", err)
}
return
}
if fileInfo.IsDir() {
@ -510,14 +512,10 @@ func (kl *Kubelet) ResponseToManifests(response *etcd.Response) ([]api.Container
func (kl *Kubelet) getKubeletStateFromEtcd(key string, updateChannel chan<- manifestUpdate) error {
response, err := kl.Client.Get(key+"/kubelet", true, false)
if err != nil {
log.Printf("Error on get on %s: %#v", key, err)
switch err.(type) {
case *etcd.EtcdError:
etcdError := err.(*etcd.EtcdError)
if etcdError.ErrorCode == 100 {
return nil
}
if util.IsEtcdNotFound(err) {
return nil
}
log.Printf("Error on etcd get of %s: %#v", key, err)
return err
}
manifests, err := kl.ResponseToManifests(response)

2
pkg/util/fake_etcd_client.go
View File

@ -71,7 +71,7 @@ func (f *FakeEtcdClient) Get(key string, sort, recursive bool) (*etcd.Response,
result := f.Data[key]
if result.R == nil {
f.t.Errorf("Unexpected get for %s", key)
return &etcd.Response{}, &etcd.EtcdError{ErrorCode: 100}
return &etcd.Response{}, &etcd.EtcdError{ErrorCode: 100} // Key not found
}
return result.R, result.E
}