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

Fix Netty ManagedChannel init for macOS 

Signed-off-by: rturner3 <turner@uber.com>
This commit is contained in:
Ryan Turner 2019-07-30 14:13:25 -07:00 committed by rturner3
parent 9652e72c9b
commit ca65e6148e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/spiffe/api/svid/SpiffeEndpointChannelBuilder.java
View File

@ -5,8 +5,8 @@ import io.grpc.netty.NegotiationType;
import io.grpc.netty.NettyChannelBuilder; import io.grpc.netty.NettyChannelBuilder;
import io.netty.channel.epoll.EpollDomainSocketChannel; import io.netty.channel.epoll.EpollDomainSocketChannel;
import io.netty.channel.epoll.EpollEventLoopGroup; import io.netty.channel.epoll.EpollEventLoopGroup;
import io.netty.channel.kqueue.KQueueDomainSocketChannel;
import io.netty.channel.kqueue.KQueueEventLoopGroup; import io.netty.channel.kqueue.KQueueEventLoopGroup;
import io.netty.channel.kqueue.KQueueServerDomainSocketChannel;
import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.unix.DomainSocketAddress; import io.netty.channel.unix.DomainSocketAddress;
import org.apache.commons.lang3.SystemUtils; import org.apache.commons.lang3.SystemUtils;
@ -110,7 +110,7 @@ class SpiffeEndpointChannelBuilder {
.channelType(EpollDomainSocketChannel.class); .channelType(EpollDomainSocketChannel.class);
} else if (SystemUtils.IS_OS_MAC) { } else if (SystemUtils.IS_OS_MAC) {
channelBuilder.eventLoopGroup(new KQueueEventLoopGroup()) channelBuilder.eventLoopGroup(new KQueueEventLoopGroup())
.channelType(KQueueServerDomainSocketChannel.class); .channelType(KQueueDomainSocketChannel.class);
} else { } else {
channelBuilder.eventLoopGroup(new NioEventLoopGroup()); channelBuilder.eventLoopGroup(new NioEventLoopGroup());
} }