Skip to content

External-ccm: Use appropriate method for printf-style log calls #524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HadrienPatte wants to merge 1 commit into
base: master
Choose a base branch
from
Open

External-ccm: Use appropriate method for printf-style log calls #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/oci-csi-controller-driver/csi-controller-driver/oci-csi-controller-driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ func StartControllerDriver(csioptions csioptions.CSIOptions, csiDriver driver.CS
drv, err = driver.NewControllerDriver(logger, *controllerDriverConfig)
}
if err != nil {
logger.With(zap.Error(err)).Fatal("Failed to create %s controller driver.", csiDriver)
logger.With(zap.Error(err)).Fatalf("Failed to create %s controller driver.", csiDriver)
}
if err := drv.Run(); err != nil {
logger.With(zap.Error(err)).Fatal("Failed to run the CSI driver for %s.", csiDriver)
logger.With(zap.Error(err)).Fatalf("Failed to run the CSI driver for %s.", csiDriver)
}

logger.Info("CSI driver exited")
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloudprovider/providers/oci/load_balancer_spec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ func getPreserveSource(logger *zap.SugaredLogger, svc *v1.Service) (bool, error)
if svc.Spec.ExternalTrafficPolicy == v1.ServiceExternalTrafficPolicyTypeCluster {
_, ok := svc.Annotations[ServiceAnnotationNetworkLoadBalancerIsPreserveSource]
if ok {
logger.Error("error : externalTrafficPolicy is set to Cluster and the %s annotation is set", ServiceAnnotationNetworkLoadBalancerIsPreserveSource)
logger.Errorf("error : externalTrafficPolicy is set to Cluster and the %s annotation is set", ServiceAnnotationNetworkLoadBalancerIsPreserveSource)
return false, fmt.Errorf("%s annotation cannot be set when externalTrafficPolicy is set to Cluster", ServiceAnnotationNetworkLoadBalancerIsPreserveSource)
}
}
Expand All @@ -715,7 +715,7 @@ func getPreserveSourceAnnotation(logger *zap.SugaredLogger, svc *v1.Service) (bo
if annotationString, ok := svc.Annotations[ServiceAnnotationNetworkLoadBalancerIsPreserveSource]; ok {
enable, err := strconv.ParseBool(annotationString)
if err != nil {
logger.Error("failed to to parse %s annotation value - %s", ServiceAnnotationNetworkLoadBalancerIsPreserveSource, annotationString)
logger.Errorf("failed to to parse %s annotation value - %s", ServiceAnnotationNetworkLoadBalancerIsPreserveSource, annotationString)
return false, fmt.Errorf("failed to to parse %s annotation value - %s", ServiceAnnotationNetworkLoadBalancerIsPreserveSource, annotationString)
}
return enable, nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudprovider/providers/oci/node_info_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func (nic *NodeInfoController) processItem(key string) error {
return err
})
if err != nil {
logger.With(zap.Error(err)).Error("Error in applying patch in node %v", err)
logger.With(zap.Error(err)).Error("Error in applying patch in node")
return err
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/oci/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ func (c *client) Networking(ociClientConfig *OCIClientConfig) NetworkingInterfac

err = configureCustomTransport(c.logger, &network.BaseClient)
if err != nil {
c.logger.Error("Failed configure custom transport for Network Client %v", err)
c.logger.Errorf("Failed configure custom transport for Network Client %v", err)
return nil
}

Expand Down Expand Up @@ -428,7 +428,7 @@ func (c *client) Identity(ociClientConfig *OCIClientConfig) IdentityInterface {

err = configureCustomTransport(c.logger, &identity.BaseClient)
if err != nil {
c.logger.Error("Failed configure custom transport for Identity Client %v", err)
c.logger.Errorf("Failed configure custom transport for Identity Client %v", err)
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/oci/client/load_balancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func (c *loadbalancerClientStruct) GetLoadBalancerByName(ctx context.Context, co
if *lb.DisplayName == name && *lb.CompartmentId == compartmentID {
return lb, err
}
logger.Info("LB name to OCID cache stale record. Actual display name: %s, compartment %s", *lb.DisplayName, *lb.CompartmentId)
logger.Infof("LB name to OCID cache stale record. Actual display name: %s, compartment %s", *lb.DisplayName, *lb.CompartmentId)
} else {
logger.Info("LB name to OCID cache failed to get LB or the response contained unexpected nil value")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/oci/client/network_load_balancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func (c *networkLoadbalancer) GetLoadBalancerByName(ctx context.Context, compart
if *lb.DisplayName == name && *lb.CompartmentId == compartmentID {
return lb, err
}
logger.Info("NLB name to OCID cache stale record. Actual display name: %s, compartment %s", *lb.DisplayName, *lb.CompartmentId)
logger.Infof("NLB name to OCID cache stale record. Actual display name: %s, compartment %s", *lb.DisplayName, *lb.CompartmentId)
} else {
logger.Info("NLB name to OCID cache failed to get LB or the response contained unexpected nil value")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/disk/mount_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func MountWithEncrypt(logger *zap.SugaredLogger, source string, target string, f
mountArgs, mountArgsLogStr := MakeMountArgs(source, target, fstype, options)
mountArgsLogStr = EncryptionMountCommand + " " + mountArgsLogStr

logger.Debug("Mounting cmd (%s) with arguments (%s)", EncryptionMountCommand, mountArgsLogStr)
logger.Debugf("Mounting cmd (%s) with arguments (%s)", EncryptionMountCommand, mountArgsLogStr)
command := exec.Command(EncryptionMountCommand, mountArgs...)
output, err := command.CombinedOutput()
if err != nil {
Expand Down
Loading