Skip to content

Commit f4c5d7d

Browse files
Merge pull request #199 from steyng/183-ok-http-client-timeout-settings
Fix for issue #183 - okHttpClient timeout settings
2 parents cd9bf61 + d54c807 commit f4c5d7d

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/main/java/com/splunk/logging/HttpEventCollectorSender.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,12 @@ private void startHttpClient() {
337337

338338
OkHttpClient.Builder builder = httpSharedClient.newBuilder();
339339

340+
// set timeouts
341+
builder.connectTimeout(timeoutSettings.connectTimeout, TimeUnit.MILLISECONDS)
342+
.callTimeout(timeoutSettings.callTimeout, TimeUnit.MILLISECONDS)
343+
.readTimeout(timeoutSettings.readTimeout, TimeUnit.MILLISECONDS)
344+
.writeTimeout(timeoutSettings.writeTimeout, TimeUnit.MILLISECONDS);
345+
340346
// limit max number of async requests in sequential mode
341347
if (sendMode == SendMode.Sequential) {
342348
Dispatcher dispatcher = new Dispatcher();
@@ -450,10 +456,10 @@ public void onFailure(Call call, IOException ex) {
450456
}
451457

452458
public static class TimeoutSettings {
453-
public static final long DEFAULT_CONNECT_TIMEOUT = 30000;
454-
public static final long DEFAULT_WRITE_TIMEOUT = 0; // 0 means no timeout
459+
public static final long DEFAULT_CONNECT_TIMEOUT = 3000;
460+
public static final long DEFAULT_WRITE_TIMEOUT = 10000; // 0 means no timeout
455461
public static final long DEFAULT_CALL_TIMEOUT = 0;
456-
public static final long DEFAULT_READ_TIMEOUT = 0;
462+
public static final long DEFAULT_READ_TIMEOUT = 10000;
457463
public static final long DEFAULT_TERMINATION_TIMEOUT = 0;
458464

459465
public long connectTimeout = DEFAULT_CONNECT_TIMEOUT;

0 commit comments

Comments
 (0)