diff options
author | zpencer <spencerfang@google.com> | 2018-05-07 11:38:16 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-07 11:38:16 -0700 |
commit | 247a76ed9321e8ad2dba9ff46a96841ba3d8a91d (patch) | |
tree | fa92be154ef42e319dab625bbf1069eb654ab335 /netty | |
parent | b83312fb7b0a679dc6ff8131be93f4b5d90c2c32 (diff) | |
download | grpc-grpc-java-247a76ed9321e8ad2dba9ff46a96841ba3d8a91d.tar.gz |
core,netty,okhttp: make toString more consistent for channelz (#4434)
Use MoreObjects.toStringHelper and use only the log id's long value,
because the class name is already present in the toStringHelper.
Diffstat (limited to 'netty')
3 files changed, 25 insertions, 2 deletions
diff --git a/netty/src/main/java/io/grpc/netty/NettyClientTransport.java b/netty/src/main/java/io/grpc/netty/NettyClientTransport.java index e46ff4ba0..a5aa771a2 100644 --- a/netty/src/main/java/io/grpc/netty/NettyClientTransport.java +++ b/netty/src/main/java/io/grpc/netty/NettyClientTransport.java @@ -20,6 +20,7 @@ import static io.grpc.internal.GrpcUtil.KEEPALIVE_TIME_NANOS_DISABLED; import static io.netty.channel.ChannelOption.SO_KEEPALIVE; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; @@ -298,7 +299,11 @@ class NettyClientTransport implements ConnectionClientTransport { @Override public String toString() { - return getLogId() + "(" + address + ")"; + return MoreObjects.toStringHelper(this) + .add("logId", logId.getId()) + .add("address", address) + .add("channel", channel) + .toString(); } @Override diff --git a/netty/src/main/java/io/grpc/netty/NettyServer.java b/netty/src/main/java/io/grpc/netty/NettyServer.java index 0f23d88f7..d85b13d5e 100644 --- a/netty/src/main/java/io/grpc/netty/NettyServer.java +++ b/netty/src/main/java/io/grpc/netty/NettyServer.java @@ -308,7 +308,7 @@ class NettyServer implements InternalServer, WithLogId { @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("logId", logId) + .add("logId", logId.getId()) .add("address", address) .toString(); } @@ -392,5 +392,13 @@ class NettyServer implements InternalServer, WithLogId { public LogId getLogId() { return id; } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("logId", id.getId()) + .add("channel", ch) + .toString(); + } } } diff --git a/netty/src/main/java/io/grpc/netty/NettyServerTransport.java b/netty/src/main/java/io/grpc/netty/NettyServerTransport.java index fafc4a508..3b573393c 100644 --- a/netty/src/main/java/io/grpc/netty/NettyServerTransport.java +++ b/netty/src/main/java/io/grpc/netty/NettyServerTransport.java @@ -17,6 +17,7 @@ package io.grpc.netty; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -234,6 +235,15 @@ class NettyServerTransport implements ServerTransport { channel.remoteAddress(), Utils.getSocketOptions(ch), grpcHandler == null ? null : grpcHandler.getSecurityInfo()); + + } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("logId", logId.getId()) + .add("channel", channel) + .toString(); } /** |