Skip to content

unix socket support #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alexkamp wants to merge 5 commits into from
Closed

unix socket support #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20cabcd
support for unix sockets
alexkamp Oct 28, 2014
5f1737b
fixed remaining problems
alexkamp Oct 28, 2014
2692d12
fixed non-closed streams
alexkamp Oct 30, 2014
92949e0
added config options for connection pool size
alexkamp Nov 7, 2014
8f740dd
removed a test which accesses unix sockets hard-coded
alexkamp Nov 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@
</developer>
</developers>

<repositories>
<repository>
<id>jcenter</id>
<url>http://jcenter.bintray.com</url>
</repository>
</repositories>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand All @@ -61,9 +68,9 @@
<commons-lang.version>2.6</commons-lang.version>
<slf4j-api.version>1.7.5</slf4j-api.version>
<jsr305.version>1.3.9</jsr305.version>
<jnr.unixsocket.version>0.3</jnr.unixsocket.version>
<guava.version>18.0</guava.version>
<bouncycastle.version>1.51</bouncycastle.version>
<unix-socket-factory.version>2014-09-26T18-52-33</unix-socket-factory.version>

<!--test dependencies -->
<version.logback>1.0.1</version.logback>
Expand Down Expand Up @@ -93,12 +100,23 @@
<!-- <artifactId>jersey-jetty-connector</artifactId> -->
<!-- <version>${jersey.version}</version> -->
<!-- </dependency> -->
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>

<dependency>
<groupId>de.gesellix</groupId>
<artifactId>unix-socket-factory</artifactId>
<version>${unix-socket-factory.version}</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
Expand All @@ -120,11 +138,6 @@
<version>${commons-io.version}</version>
</dependency>

<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-unixsocket</artifactId>
<version>${jnr.unixsocket.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/github/dockerjava/api/command/EventCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ public interface EventCallback {
public void onEvent(Event event);
public void onException(Throwable throwable);
public void onCompletion(int numEvents);
public boolean isReceiving();
}
51 changes: 45 additions & 6 deletions src/main/java/com/github/dockerjava/core/DockerClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ public class DockerClientConfig {
// this is really confusing, as there are two ways to spell it
private static final String DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY = "docker.io.enableLoggingFilter";
private static final String DOCKER_IO_DOCKER_CERT_PATH_PROPERTY = "docker.io.dockerCertPath";
// connection pooling properties
private static final String DOCKER_IO_MAX_PER_ROUTE_PROPERTY = "docker.io.perRouteConnections";
private static final String DOCKER_IO_MAX_TOTAL_PROPERTY = "docker.io.totalConnections";

/**
* A map from the environment name to the interval name.
*/
Expand All @@ -36,12 +40,17 @@ public class DockerClientConfig {
.put(DOCKER_CERT_PATH_PROPERTY, DOCKER_IO_DOCKER_CERT_PATH_PROPERTY)
.build();
private static final String DOCKER_IO_PROPERTIES_PROPERTY = "docker.io.properties";
private final URI uri;
private URI uri;
private final String version, username, password, email, dockerCertPath;
private final Integer readTimeout;
private final boolean loggingFilterEnabled;

private final int maxTotalConnections;
private final int maxPerRouteConnections;

DockerClientConfig(URI uri, String version, String username, String password, String email, String dockerCertPath, Integer readTimeout, boolean loggingFilterEnabled) {
DockerClientConfig(URI uri, String version, String username, String password, String email,
String dockerCertPath, Integer readTimeout, boolean loggingFilterEnabled,
int maxTotalConns, int maxPerRouteConns) {
this.uri = uri;
this.version = version;
this.username = username;
Expand All @@ -50,6 +59,9 @@ public class DockerClientConfig {
this.dockerCertPath = dockerCertPath;
this.readTimeout = readTimeout;
this.loggingFilterEnabled = loggingFilterEnabled;

this.maxTotalConnections = maxTotalConns;
this.maxPerRouteConnections = maxPerRouteConns;
}

private static Properties loadIncludedDockerProperties(Properties systemProperties) {
Expand Down Expand Up @@ -176,7 +188,11 @@ public URI getUri() {
return uri;
}

public String getVersion() {
public void setUri(URI uri) {
this.uri = uri;
}

public String getVersion() {
return version;
}

Expand Down Expand Up @@ -254,7 +270,7 @@ public String toString() {
public static class DockerClientConfigBuilder {
private URI uri;
private String version, username, password, email, dockerCertPath;
private Integer readTimeout;
private Integer readTimeout, maxTotalConnections, maxPerRouteConnections;
private boolean loggingFilterEnabled;

/**
Expand All @@ -271,7 +287,10 @@ public DockerClientConfigBuilder withProperties(Properties p) {
.withEmail(p.getProperty(DOCKER_IO_EMAIL_PROPERTY))
.withReadTimeout(Integer.valueOf(p.getProperty(DOCKER_IO_READ_TIMEOUT_PROPERTY, "0")))
.withLoggingFilter(Boolean.valueOf(p.getProperty(DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY, "true")))
.withDockerCertPath(p.getProperty(DOCKER_IO_DOCKER_CERT_PATH_PROPERTY));
.withDockerCertPath(p.getProperty(DOCKER_IO_DOCKER_CERT_PATH_PROPERTY))
.withMaxPerRouteConnections(Integer.valueOf(p.getProperty(DOCKER_IO_MAX_PER_ROUTE_PROPERTY, "2")))
.withMaxTotalConnections(Integer.valueOf(p.getProperty(DOCKER_IO_MAX_TOTAL_PROPERTY, "20")))
;
}

public final DockerClientConfigBuilder withUri(String uri) {
Expand Down Expand Up @@ -304,6 +323,16 @@ public final DockerClientConfigBuilder withReadTimeout(Integer readTimeout) {
this.readTimeout = readTimeout;
return this;
}

public final DockerClientConfigBuilder withMaxTotalConnections(Integer maxTotalConnections) {
this.maxTotalConnections = maxTotalConnections;
return this;
}

public final DockerClientConfigBuilder withMaxPerRouteConnections(Integer maxPerRouteConnections) {
this.maxPerRouteConnections = maxPerRouteConnections;
return this;
}

public final DockerClientConfigBuilder withLoggingFilter(boolean loggingFilterEnabled) {
this.loggingFilterEnabled = loggingFilterEnabled;
Expand All @@ -324,8 +353,18 @@ public DockerClientConfig build() {
email,
dockerCertPath,
readTimeout,
loggingFilterEnabled
loggingFilterEnabled,
maxTotalConnections,
maxPerRouteConnections
);
}
}

public int getMaxTotalConnections() {
return maxTotalConnections;
}

public int getMaxPerRoutConnections() {
return maxPerRouteConnections;
}
}
Loading