Skip to content

Commit

Permalink
xds/internal/server: cleanup formatting directives in some logs (#6820)
Browse files Browse the repository at this point in the history
  • Loading branch information
easwars authored Nov 29, 2023
1 parent bc16b5f commit 737f87b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions xds/internal/server/listener_wrapper.go
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ func (l *listenerWrapper) Accept() (net.Conn, error) {
// error, `grpc.Serve()` method sleeps for a small duration and
// therefore ends up blocking all connection attempts during that
// time frame, which is also not ideal for an error like this.
l.logger.Warningf("Connection from %s to %s failed to find any matching filter chain", conn.RemoteAddr().String(), conn.LocalAddr().String())
l.logger.Warningf("Connection from %s to %s failed to find any matching filter chain", conn.RemoteAddr(), conn.LocalAddr())
conn.Close()
continue
}
Expand Down Expand Up @@ -425,19 +425,19 @@ func (lw *ldsWatcher) OnError(err error) {
return
}
if lw.logger.V(2) {
lw.logger.Infof("LDS watch for resource %q reported error: %#v", lw.name, err)
lw.logger.Infof("LDS watch for resource %q reported error: %v", lw.name, err)
}
// For errors which are anything other than "resource-not-found", we
// continue to use the old configuration.
}

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

0 comments on commit 737f87b

Please sign in to comment.