Skip to content
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

Jump to bottom

Fix for issue #183 - okHttpClient timeout settings #199

Merged
merged 5 commits into from Feb 2, 2022
Merged

Fix for issue #183 - okHttpClient timeout settings #199

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff31814
Issue #183: Ensure that the httpClient is configured to make use of t…
steyng Sep 11, 2021
b98bb6b
Issue #183: Ensure that the httpClient is configured to make use of t…
steyng Sep 11, 2021
0c0c62a
Issue #183: Revert changes to the originals pointed out by @macrergat…
steyng Sep 15, 2021
84e48fc
Issue #183: Allign changes with the pull request in https://github.co…
steyng Oct 12, 2021
d54c807
Merge branch 'main' into 183-ok-http-client-timeout-settings
vmalaviya-splunk Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/main/java/com/splunk/logging/HttpEventCollectorSender.java
View file
Open in desktop
Expand Up @@ -337,6 +337,12 @@ private void startHttpClient() {

OkHttpClient.Builder builder = httpSharedClient.newBuilder();

// set timeouts
builder.connectTimeout(timeoutSettings.connectTimeout, TimeUnit.MILLISECONDS)
.callTimeout(timeoutSettings.callTimeout, TimeUnit.MILLISECONDS)
.readTimeout(timeoutSettings.readTimeout, TimeUnit.MILLISECONDS)
.writeTimeout(timeoutSettings.writeTimeout, TimeUnit.MILLISECONDS);

// limit max number of async requests in sequential mode
if (sendMode == SendMode.Sequential) {
Dispatcher dispatcher = new Dispatcher();
Expand Down Expand Up @@ -450,10 +456,10 @@ public void onFailure(Call call, IOException ex) {
}

public static class TimeoutSettings {
public static final long DEFAULT_CONNECT_TIMEOUT = 30000;
public static final long DEFAULT_WRITE_TIMEOUT = 0; // 0 means no timeout
public static final long DEFAULT_CONNECT_TIMEOUT = 3000;
public static final long DEFAULT_WRITE_TIMEOUT = 10000; // 0 means no timeout
public static final long DEFAULT_CALL_TIMEOUT = 0;
public static final long DEFAULT_READ_TIMEOUT = 0;
public static final long DEFAULT_READ_TIMEOUT = 10000;
public static final long DEFAULT_TERMINATION_TIMEOUT = 0;

public long connectTimeout = DEFAULT_CONNECT_TIMEOUT;
Expand Down