grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

alts: Use normal defaults in Alts{Channel,Server}Builder 

The ALTS builders are supposed to act like ChannelCreds, as done in
other languages. ChannelCreds don't have the opportunity to change
settings like this. In addition, the options here weren't set in
GoogleDefaultChannelBuilder and ComputeEngineChannelBuilder.
This commit is contained in:
Eric Anderson 2019-04-18 10:32:45 -07:00
parent dc0171839a
commit 7e219c349e
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
alts/src/main/java/io/grpc/alts/AltsChannelBuilder.java
View File

@ -41,7 +41,6 @@ import io.grpc.internal.ObjectPool;
import io.grpc.internal.SharedResourcePool; import io.grpc.internal.SharedResourcePool;
import io.grpc.netty.InternalNettyChannelBuilder; import io.grpc.netty.InternalNettyChannelBuilder;
import io.grpc.netty.NettyChannelBuilder; import io.grpc.netty.NettyChannelBuilder;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -74,11 +73,7 @@ public final class AltsChannelBuilder extends ForwardingChannelBuilder<AltsChann
} }
private AltsChannelBuilder(String target) { private AltsChannelBuilder(String target) {
delegate = delegate = NettyChannelBuilder.forTarget(target);
NettyChannelBuilder.forTarget(target)
.keepAliveTime(20, TimeUnit.SECONDS)
.keepAliveTimeout(10, TimeUnit.SECONDS)
.keepAliveWithoutCalls(true);
InternalNettyChannelBuilder.setProtocolNegotiatorFactory( InternalNettyChannelBuilder.setProtocolNegotiatorFactory(
delegate(), new ProtocolNegotiatorFactory()); delegate(), new ProtocolNegotiatorFactory());
} }

8
alts/src/main/java/io/grpc/alts/AltsServerBuilder.java
View File

@ -70,13 +70,7 @@ public final class AltsServerBuilder extends ServerBuilder<AltsServerBuilder> {
/** Creates a gRPC server builder for the given port. */ /** Creates a gRPC server builder for the given port. */
public static AltsServerBuilder forPort(int port) { public static AltsServerBuilder forPort(int port) {
NettyServerBuilder nettyDelegate = NettyServerBuilder nettyDelegate = NettyServerBuilder.forAddress(new InetSocketAddress(port));
NettyServerBuilder.forAddress(new InetSocketAddress(port))
.maxConnectionIdle(1, TimeUnit.HOURS)
.keepAliveTime(270, TimeUnit.SECONDS)
.keepAliveTimeout(20, TimeUnit.SECONDS)
.permitKeepAliveTime(10, TimeUnit.SECONDS)
.permitKeepAliveWithoutCalls(true);
return new AltsServerBuilder(nettyDelegate); return new AltsServerBuilder(nettyDelegate);
} }