Merge pull request #25 from spiffe/dev

Merge dev into master
spiffe · May 18, 2020 · 25cb640 · 25cb640
2 parents 8c3866e + c7c7cf3
commit 25cb640
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'spiffe'
-version '0.5.0'
+version '0.5.1'
 
 buildscript {
     repositories {

diff --git a/src/main/java/spiffe/api/svid/SpiffeEndpointChannelBuilder.java b/src/main/java/spiffe/api/svid/SpiffeEndpointChannelBuilder.java
@@ -3,6 +3,7 @@
 import io.grpc.*;
 import io.grpc.netty.NegotiationType;
 import io.grpc.netty.NettyChannelBuilder;
+import io.netty.channel.ChannelOption;
 import io.netty.channel.epoll.EpollDomainSocketChannel;
 import io.netty.channel.epoll.EpollEventLoopGroup;
 import io.netty.channel.kqueue.KQueueDomainSocketChannel;
@@ -107,10 +108,13 @@ private static void configureNativeSocketChannel(NettyChannelBuilder channelBuil
         checkNotNull(channelBuilder, "Channel builder is Null");
         if (SystemUtils.IS_OS_LINUX) {
             channelBuilder.eventLoopGroup(new EpollEventLoopGroup())
-                          .channelType(EpollDomainSocketChannel.class);
+                    // avoid Unknown channel option 'SO_KEEPALIVE'
+                    .withOption(ChannelOption.SO_KEEPALIVE, null)
+                    .channelType(EpollDomainSocketChannel.class);
         } else if (SystemUtils.IS_OS_MAC) {
             channelBuilder.eventLoopGroup(new KQueueEventLoopGroup())
-                          .channelType(KQueueDomainSocketChannel.class);
+                    .withOption(ChannelOption.SO_KEEPALIVE, null)
+                    .channelType(KQueueDomainSocketChannel.class);
         } else {
             channelBuilder.eventLoopGroup(new NioEventLoopGroup());
         }