Merge pull request #12940 from Miciah/Warning-to-Warningf

glog.Warning -> glog.Warningf
This commit is contained in:
Yu-Ju Hong 2015-08-26 13:36:05 -07:00
commit d839ab2024
3 changed files with 3 additions and 3 deletions

View File

@ -1773,7 +1773,7 @@ func findSecurityGroupForInstance(instance *ec2.Instance) *string {
if securityGroupId != nil {
// We create instances with one SG
glog.Warning("Multiple security groups found for instance (%s); will use first group (%s)", orEmpty(instance.InstanceID), *securityGroupId)
glog.Warningf("Multiple security groups found for instance (%s); will use first group (%s)", orEmpty(instance.InstanceID), *securityGroupId)
continue
} else {
securityGroupId = securityGroup.GroupID

View File

@ -163,7 +163,7 @@ func (pc *podAndContainerCollector) Describe(ch chan<- *prometheus.Desc) {
func (pc *podAndContainerCollector) Collect(ch chan<- prometheus.Metric) {
runningPods, err := pc.containerCache.GetPods()
if err != nil {
glog.Warning("Failed to get running container information while collecting metrics: %v", err)
glog.Warningf("Failed to get running container information while collecting metrics: %v", err)
return
}

View File

@ -310,7 +310,7 @@ func (runner *runner) run(op operation, args []string) ([]byte, error) {
func (runner *runner) checkRule(table Table, chain Chain, args ...string) (bool, error) {
checkPresent, err := getIptablesHasCheckCommand(runner.exec)
if err != nil {
glog.Warning("Error checking iptables version, assuming version at least 1.4.11: %v", err)
glog.Warningf("Error checking iptables version, assuming version at least 1.4.11: %v", err)
checkPresent = true
}
if checkPresent {