Skip to content

Commit 2678e48

Browse files
committed
xds/internal/server: cleanup formatting directives in some logs
1 parent 02ea031 commit 2678e48

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

xds/internal/server/listener_wrapper.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ func (l *listenerWrapper) Accept() (net.Conn, error) {
254254
// error, `grpc.Serve()` method sleeps for a small duration and
255255
// therefore ends up blocking all connection attempts during that
256256
// time frame, which is also not ideal for an error like this.
257-
l.logger.Warningf("Connection from %s to %s failed to find any matching filter chain", conn.RemoteAddr().String(), conn.LocalAddr().String())
257+
l.logger.Warningf("Connection from %s to %s failed to find any matching filter chain", conn.RemoteAddr(), conn.LocalAddr())
258258
conn.Close()
259259
continue
260260
}
@@ -425,19 +425,19 @@ func (lw *ldsWatcher) OnError(err error) {
425425
return
426426
}
427427
if lw.logger.V(2) {
428-
lw.logger.Infof("LDS watch for resource %q reported error: %#v", lw.name, err)
428+
lw.logger.Infof("LDS watch for resource %q reported error: %v", lw.name, err)
429429
}
430430
// For errors which are anything other than "resource-not-found", we
431431
// continue to use the old configuration.
432432
}
433433

434434
func (lw *ldsWatcher) OnResourceDoesNotExist() {
435435
if lw.parent.closed.HasFired() {
436-
lw.logger.Warningf("Resource %q received resource-not-found-error after listener was closed", lw.name)
436+
lw.logger.Warningf("Resource %q received resource-does-not-exist error after listener was closed", lw.name)
437437
return
438438
}
439439
if lw.logger.V(2) {
440-
lw.logger.Infof("LDS watch for resource %q reported resource-does-not-exist error: %v", lw.name)
440+
lw.logger.Infof("LDS watch for resource %q reported resource-does-not-exist error", lw.name)
441441
}
442442
err := xdsresource.NewErrorf(xdsresource.ErrorTypeResourceNotFound, "resource name %q of type Listener not found in received response", lw.name)
443443
lw.parent.switchMode(nil, connectivity.ServingModeNotServing, err)

0 commit comments

Comments
 (0)