Skip to content

Allow to configure connection pool timeout #703

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

Merged
marcuslinke merged 1 commit into from
Sep 12, 2016
Merged

Allow to configure connection pool timeout #703

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.github.dockerjava.api.command.UpdateContainerCmd;
import com.github.dockerjava.core.SSLConfig;

import org.apache.http.client.config.RequestConfig;
import org.apache.http.config.RegistryBuilder;
import org.apache.http.conn.socket.ConnectionSocketFactory;
import org.apache.http.conn.socket.PlainConnectionSocketFactory;
Expand Down Expand Up @@ -110,6 +111,8 @@ public class JerseyDockerCmdExecFactory implements DockerCmdExecFactory {

private Integer maxPerRouteConnections = null;

private Integer connectionRequestTimeout = null;

private ClientRequestFilter[] clientRequestFilters = null;

private ClientResponseFilter[] clientResponseFilters = null;
Expand Down Expand Up @@ -216,9 +219,10 @@ public void shutdown() {
clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager);

// Configure connection pool timeout
// clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, RequestConfig.custom()
// .setConnectionRequestTimeout(1000).build());

if (connectionRequestTimeout != null) {
clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, RequestConfig.custom()
.setConnectionRequestTimeout(connectionRequestTimeout).build());
}
ClientBuilder clientBuilder = ClientBuilder.newBuilder().withConfig(clientConfig);

if (sslContext != null) {
Expand Down Expand Up @@ -570,6 +574,11 @@ public JerseyDockerCmdExecFactory withMaxPerRouteConnections(Integer maxPerRoute
return this;
}

public JerseyDockerCmdExecFactory withConnectionRequestTimeout(Integer connectionRequestTimeout) {
this.connectionRequestTimeout = connectionRequestTimeout;
return this;
}

public JerseyDockerCmdExecFactory withClientResponseFilters(ClientResponseFilter... clientResponseFilter) {
this.clientResponseFilters = clientResponseFilter;
return this;
Expand Down