Skip to content

Commit c05cfb3

Browse files
authored
balancer/rls: Use log *f functions with format args (#8859)
These log messages include format arguments, but were calling the variants that do not do formatting. Also replace the use of %q for integer arguments with %d. balancer: logger.Info -> logger.Infof fakegrpclb: * Use Warningf/Infof * Use %d with integers instead of %q RELEASE NOTES: N/A
1 parent a8d11ce commit c05cfb3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

balancer/rls/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ func parseRLSProto(rlsProto *rlspb.RouteLookupConfig) (*lbConfig, error) {
265265
return nil, fmt.Errorf("rls: cache_size_bytes must be set to a non-zero value: %+v", rlsProto)
266266
}
267267
if cacheSizeBytes > maxCacheSize {
268-
logger.Info("rls: cache_size_bytes %v is too large, setting it to: %v", cacheSizeBytes, maxCacheSize)
268+
logger.Infof("rls: cache_size_bytes %v is too large, setting it to: %v", cacheSizeBytes, maxCacheSize)
269269
cacheSizeBytes = maxCacheSize
270270
}
271271
return &lbConfig{

internal/testutils/fakegrpclb/server.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func (s *Server) BalanceLoad(stream lbgrpc.LoadBalancer_BalanceLoadServer) error
168168
return nil
169169
}
170170
if err != nil {
171-
logger.Warning("Failed to read LoadBalanceRequest from stream: %v", err)
171+
logger.Warningf("Failed to read LoadBalanceRequest from stream: %v", err)
172172
return err
173173
}
174174
logger.Infof("Received LoadBalancerRequest:\n%s", pretty.ToJSON(req))
@@ -191,16 +191,16 @@ func (s *Server) BalanceLoad(stream lbgrpc.LoadBalancer_BalanceLoadServer) error
191191
} else {
192192
p, err := strconv.Atoi(port)
193193
if err != nil {
194-
logger.Info("Failed to parse requested service port %q to integer", port)
194+
logger.Infof("Failed to parse requested service port %q to integer", port)
195195
return status.Error(codes.Unknown, "Bad requested service port number")
196196
}
197197
if p != s.servicePort {
198-
logger.Info("Requested service port number %q does not match expected", port, s.servicePort)
198+
logger.Infof("Requested service port number %d does not match expected %d", p, s.servicePort)
199199
return status.Error(codes.Unknown, "Bad requested service port number")
200200
}
201201
}
202202
if serviceName != s.serviceName {
203-
logger.Info("Requested service name %q does not match expected %q", serviceName, s.serviceName)
203+
logger.Infof("Requested service name %q does not match expected %q", serviceName, s.serviceName)
204204
return status.Error(codes.NotFound, "Bad requested service name")
205205
}
206206

0 commit comments

Comments
 (0)