Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #3180 - Review client support for Unix sockets. 

Updated code after reviews.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2019-03-19 23:36:37 +01:00
parent 0f6496abb3
commit 4cbc933220
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-unixsocket/src/main/java/org/eclipse/jetty/unixsocket/client/HttpClientTransportOverUnixSockets.java
View File

@ -19,6 +19,7 @@
package org.eclipse.jetty.unixsocket.client; package org.eclipse.jetty.unixsocket.client;
import java.io.IOException; import java.io.IOException;
import java.net.ConnectException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketException; import java.net.SocketException;
@ -67,7 +68,7 @@ public class HttpClientTransportOverUnixSockets extends HttpClientTransportOverH
{ {
InetAddress inet = address.getAddress(); InetAddress inet = address.getAddress();
if (!inet.isLoopbackAddress() && !inet.isLinkLocalAddress() && !inet.isSiteLocalAddress()) if (!inet.isLoopbackAddress() && !inet.isLinkLocalAddress() && !inet.isSiteLocalAddress())
throw new IOException("UnixSocket cannot connect to " + address.getHostString()); throw new ConnectException("UnixSocket cannot connect to " + address.getHostString());
UnixSocketAddress unixAddress = new UnixSocketAddress(_unixSocket); UnixSocketAddress unixAddress = new UnixSocketAddress(_unixSocket);
channel = UnixSocketChannel.open(unixAddress); channel = UnixSocketChannel.open(unixAddress);

4
tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/TransportProvider.java
View File

@ -20,10 +20,10 @@ package org.eclipse.jetty.http.client;
import java.util.Arrays; import java.util.Arrays;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Locale;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.StringUtil;
import org.junit.jupiter.api.condition.OS;
import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider; import org.junit.jupiter.params.provider.ArgumentsProvider;
@ -37,7 +37,7 @@ public class TransportProvider implements ArgumentsProvider
if (!StringUtil.isBlank(transports)) if (!StringUtil.isBlank(transports))
return Arrays.stream(transports.split("\\s*,\\s*")).map(Transport::valueOf); return Arrays.stream(transports.split("\\s*,\\s*")).map(Transport::valueOf);
if (System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("linux")) if (OS.LINUX.isCurrentOs())
return Arrays.stream(Transport.values()); return Arrays.stream(Transport.values());
return EnumSet.complementOf(EnumSet.of(Transport.UNIX_SOCKET)).stream(); return EnumSet.complementOf(EnumSet.of(Transport.UNIX_SOCKET)).stream();