Skip to content

set default socket timeout for RequestConfig #853

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
KostyaSha merged 1 commit into from
Jun 3, 2017
Merged

set default socket timeout for RequestConfig #853

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
8 changes: 5 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 @@ -134,15 +134,17 @@ public void init(DockerClientConfig dockerClientConfig) {
clientConfig.register(ResponseStatusExceptionFilter.class);
clientConfig.register(JsonClientFilter.class);
clientConfig.register(JacksonJsonProvider.class);

RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
// logging may disabled via log level
clientConfig.register(new SelectiveLoggingFilter(LOGGER, true));

if (readTimeout != null) {
requestConfigBuilder.setSocketTimeout(readTimeout);
clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout);
}

if (connectTimeout != null) {
requestConfigBuilder.setConnectTimeout(connectTimeout);
clientConfig.property(ClientProperties.CONNECT_TIMEOUT, connectTimeout);
}

Expand Down Expand Up @@ -221,9 +223,9 @@ public void shutdown() {

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

if (sslContext != null) {
Expand Down