Skip to content

Request timeout fix #52

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
merged 1 commit into from
Apr 8, 2021
Merged

Request timeout fix #52

Show file tree
Hide file tree
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
18 changes: 17 additions & 1 deletion src/main/java/org/sourcelab/kafka/connect/apiclient/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public final class Configuration {

// Optional Connection options
private int requestTimeoutInSeconds = 300;
private int connectionTimeToLiveInSeconds = 300;

// Optional BasicAuth options
private String basicAuthUsername = null;
Expand Down Expand Up @@ -164,6 +165,16 @@ public Configuration useRequestTimeoutInSeconds(final int requestTimeoutInSecond
return this;
}

/**
* Sets maximum time to live for persistent connections
* @param connectionTimeToLiveInSeconds How long before persistent connection will be interrupted, in seconds
* @return Configuration instance.
*/
public Configuration useConnectionTimeToLiveInSeconds(final int connectionTimeToLiveInSeconds) {
this.connectionTimeToLiveInSeconds = connectionTimeToLiveInSeconds;
return this;
}

public String getProxyHost() {
return proxyHost;
}
Expand Down Expand Up @@ -204,6 +215,10 @@ public int getRequestTimeoutInSeconds() {
return requestTimeoutInSeconds;
}

public int getConnectionTimeToLiveInSeconds() {
return connectionTimeToLiveInSeconds;
}

public File getKeyStoreFile() {
return keyStoreFile;
}
Expand All @@ -224,7 +239,8 @@ public String getBasicAuthPassword() {
public String toString() {
final StringBuilder stringBuilder = new StringBuilder("Configuration{")
.append("apiHost='").append(apiHost).append('\'')
.append(", requestTimeout='").append(requestTimeoutInSeconds).append('\'');
.append(", requestTimeout='").append(requestTimeoutInSeconds).append('\'')
.append("connectionTimeToLiveInSeconds='").append(connectionTimeToLiveInSeconds).append('\'');
if (proxyHost != null) {
stringBuilder
.append(", proxy='").append(proxyScheme).append("://");
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/sourcelab/kafka/connect/apiclient/rest/HttpClientRestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,16 @@ public void init(final Configuration configuration) {
final HttpClientBuilder clientBuilder = HttpClientBuilder.create();
clientBuilder
// Define timeout
.setConnectionTimeToLive(configuration.getRequestTimeoutInSeconds(), TimeUnit.SECONDS)
.setConnectionTimeToLive(configuration.getConnectionTimeToLiveInSeconds(), TimeUnit.SECONDS)

// Define SSL Socket Factory instance.
.setSSLSocketFactory(httpsContextBuilder.createSslSocketFactory());

// Define our RequestConfigBuilder
final RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();

requestConfigBuilder.setConnectTimeout(configuration.getRequestTimeoutInSeconds() * 1_000);

// Define our Credentials Provider
final CredentialsProvider credsProvider = new BasicCredentialsProvider();

Expand Down