github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #216 from thockin/logging

Browse Source 
Minor: log cleanups
This commit is contained in:
brendandburns 2014-06-23 22:38:06 -07:00
commit e811e24b23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/kubelet.go
View File

@ -526,7 +526,7 @@ func (kl *Kubelet) getKubeletStateFromEtcd(key string, updateChannel chan<- mani
log.Printf("Error parsing response (%#v): %s", response, err) log.Printf("Error parsing response (%#v): %s", response, err)
return err return err
} }
log.Printf("Got initial state from etcd: %+v", manifests) log.Printf("Got state from etcd: %+v", manifests)
updateChannel <- manifestUpdate{etcdSource, manifests} updateChannel <- manifestUpdate{etcdSource, manifests}
return nil return nil
} }
@ -595,11 +595,11 @@ func (kl *Kubelet) WatchEtcd(watchChannel <-chan *etcd.Response, updateChannel c
defer util.HandleCrash() defer util.HandleCrash()
for { for {
watchResponse := <-watchChannel watchResponse := <-watchChannel
log.Printf("Got change: %#v", watchResponse)
// This means the channel has been closed. // This means the channel has been closed.
if watchResponse == nil { if watchResponse == nil {
return return
} }
log.Printf("Got etcd change: %#v", watchResponse)
manifests, err := kl.extractFromEtcd(watchResponse) manifests, err := kl.extractFromEtcd(watchResponse)
if err != nil { if err != nil {
log.Printf("Error handling response from etcd: %#v", err) log.Printf("Error handling response from etcd: %#v", err)
@ -646,7 +646,7 @@ func (kl *Kubelet) createNetworkContainer(manifest *api.ContainerManifest) (stri
// Sync the configured list of containers (desired state) with the host current state // Sync the configured list of containers (desired state) with the host current state
func (kl *Kubelet) SyncManifests(config []api.ContainerManifest) error { func (kl *Kubelet) SyncManifests(config []api.ContainerManifest) error {
log.Printf("Desired:%#v", config) log.Printf("Desired: %#v", config)
var err error var err error
desired := map[string]bool{} desired := map[string]bool{}
for _, manifest := range config { for _, manifest := range config {
@ -656,7 +656,7 @@ func (kl *Kubelet) SyncManifests(config []api.ContainerManifest) error {
continue continue
} }
if !exists { if !exists {
log.Printf("Network container doesn't exit, creating") log.Printf("Network container doesn't exist, creating")
netName, err = kl.createNetworkContainer(&manifest) netName, err = kl.createNetworkContainer(&manifest)
if err != nil { if err != nil {
log.Printf("Failed to create network container: %#v", err) log.Printf("Failed to create network container: %#v", err)
@ -698,7 +698,7 @@ func (kl *Kubelet) SyncManifests(config []api.ContainerManifest) error {
} }
} }
existingContainers, _ := kl.ListContainers() existingContainers, _ := kl.ListContainers()
log.Printf("Existing:\n%#v Desired: %#v", existingContainers, desired) log.Printf("Existing: %#v Desired: %#v", existingContainers, desired)
for _, container := range existingContainers { for _, container := range existingContainers {
// Skip containers that we didn't create to allow users to manually // Skip containers that we didn't create to allow users to manually
// spin up their own containers if they want. // spin up their own containers if they want.