From a0831a2378c613188dd877b5332788448e707a28 Mon Sep 17 00:00:00 2001 From: Rudi Chiarito Date: Fri, 29 Jan 2016 14:35:04 -0500 Subject: [PATCH] Mass fix of Infof and co. missing the trailing "f", even when formatting placeholders are used --- cmd/kubemark/hollow-node.go | 2 +- cmd/libs/go2idl/client-gen/main.go | 2 +- pkg/cloudprovider/providers/aws/aws.go | 4 ++-- pkg/cloudprovider/providers/openstack/openstack.go | 2 +- .../persistentvolume_provisioner_controller.go | 2 +- pkg/kubelet/rkt/rkt.go | 2 +- pkg/metrics/generic_metrics.go | 2 +- pkg/volume/empty_dir/empty_dir_linux.go | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/kubemark/hollow-node.go b/cmd/kubemark/hollow-node.go index e5bd5f122c1..49f2868584c 100644 --- a/cmd/kubemark/hollow-node.go +++ b/cmd/kubemark/hollow-node.go @@ -84,7 +84,7 @@ func main() { util.InitFlags() if !knownMorphs.Has(config.Morph) { - glog.Fatal("Unknown morph: %v. Allowed values: %v", config.Morph, knownMorphs.List()) + glog.Fatalf("Unknown morph: %v. Allowed values: %v", config.Morph, knownMorphs.List()) } // create a client to communicate with API server. diff --git a/cmd/libs/go2idl/client-gen/main.go b/cmd/libs/go2idl/client-gen/main.go index d7417f6e3e0..280c1c0ddec 100644 --- a/cmd/libs/go2idl/client-gen/main.go +++ b/cmd/libs/go2idl/client-gen/main.go @@ -98,7 +98,7 @@ func main() { if err != nil { glog.Fatalf("Error: %v", err) } - glog.Info("going to generate clientset from these input paths: %v", inputPath) + glog.Infof("going to generate clientset from these input paths: %v", inputPath) arguments.InputDirs = append(inputPath, dependencies...) // TODO: we need to make OutPackagePath a map[string]string. For example, // we need clientset and the individual typed clients be output to different diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index 514fe4d97ea..5cf18d44ddd 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -1206,7 +1206,7 @@ func (c *AWSCloud) AttachDisk(instanceName string, diskName string, readOnly boo return "", fmt.Errorf("Error attaching EBS volume: %v", err) } - glog.V(2).Info("AttachVolume request returned %v", attachResponse) + glog.V(2).Infof("AttachVolume request returned %v", attachResponse) } err = disk.waitForAttachmentStatus("attached") @@ -1833,7 +1833,7 @@ func (s *AWSCloud) EnsureLoadBalancer(name, region string, publicIP net.IP, port err = s.ensureLoadBalancerInstances(orEmpty(loadBalancer.LoadBalancerName), loadBalancer.Instances, instances) if err != nil { - glog.Warning("Error registering instances with the load balancer: %v", err) + glog.Warningf("Error registering instances with the load balancer: %v", err) return nil, err } diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go index 320bc308566..7237615283f 100644 --- a/pkg/cloudprovider/providers/openstack/openstack.go +++ b/pkg/cloudprovider/providers/openstack/openstack.go @@ -679,7 +679,7 @@ func (lb *LoadBalancer) EnsureLoadBalancer(name, region string, loadBalancerIP n return nil, fmt.Errorf("unsupported load balancer affinity: %v", affinity) } - glog.V(2).Info("Checking if openstack load balancer already exists: %s", name) + glog.V(2).Infof("Checking if openstack load balancer already exists: %s", name) _, exists, err := lb.GetLoadBalancer(name, region) if err != nil { return nil, fmt.Errorf("error checking if openstack load balancer already exists: %v", err) diff --git a/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go b/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go index 32a30de2a53..e2398a88d0f 100644 --- a/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go @@ -202,7 +202,7 @@ func (controller *PersistentVolumeProvisionerController) reconcileClaim(claim *a claim.Annotations[pvProvisioningRequiredAnnotationKey] = pvProvisioningCompletedAnnotationValue _, err = controller.client.UpdatePersistentVolumeClaim(claim) if err != nil { - glog.Error("error updating persistent volume claim: %v", err) + glog.Errorf("error updating persistent volume claim: %v", err) } return nil diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index cb393c7812a..56c6cefe533 100644 --- a/pkg/kubelet/rkt/rkt.go +++ b/pkg/kubelet/rkt/rkt.go @@ -1428,7 +1428,7 @@ func (r *Runtime) GetPodStatus(uid types.UID, name, namespace string) (*kubecont for _, pod := range listResp.Pods { manifest, creationTime, restartCount, err := getPodInfo(pod) if err != nil { - glog.Warning("rkt: Couldn't get necessary info from the rkt pod, (uuid %q): %v", pod.Id, err) + glog.Warningf("rkt: Couldn't get necessary info from the rkt pod, (uuid %q): %v", pod.Id, err) continue } diff --git a/pkg/metrics/generic_metrics.go b/pkg/metrics/generic_metrics.go index 57dd016d86c..eecae0e7091 100644 --- a/pkg/metrics/generic_metrics.go +++ b/pkg/metrics/generic_metrics.go @@ -134,7 +134,7 @@ func parseMetrics(data string, knownMetrics map[string][]string, output *Metrics if isKnownMetric || isCommonMetric { (*output)[name] = append((*output)[name], metric) } else { - glog.Warning("Unknown metric %v", metric) + glog.Warningf("Unknown metric %v", metric) if unknownMetrics != nil { unknownMetrics.Insert(name) } diff --git a/pkg/volume/empty_dir/empty_dir_linux.go b/pkg/volume/empty_dir/empty_dir_linux.go index 3c1f2ccd514..d1ecf2b9344 100644 --- a/pkg/volume/empty_dir/empty_dir_linux.go +++ b/pkg/volume/empty_dir/empty_dir_linux.go @@ -46,7 +46,7 @@ func (m *realMountDetector) GetMountMedium(path string) (storageMedium, bool, er return 0, false, fmt.Errorf("statfs(%q): %v", path, err) } - glog.V(5).Info("Statfs_t of %v: %+v", path, buf) + glog.V(5).Infof("Statfs_t of %v: %+v", path, buf) if buf.Type == linuxTmpfsMagic { return mediumMemory, !notMnt, nil }