From aee0c45d75ca7d4774d008d095b9573be948ed3a Mon Sep 17 00:00:00 2001 From: Stainless Bot Date: Tue, 15 Aug 2023 20:58:24 +0000 Subject: [PATCH] fix: set correct timeouts on okhttp client --- .../tryfinch/api/client/okhttp/OkHttpClient.kt | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/finch-java-client-okhttp/src/main/kotlin/com/tryfinch/api/client/okhttp/OkHttpClient.kt b/finch-java-client-okhttp/src/main/kotlin/com/tryfinch/api/client/okhttp/OkHttpClient.kt index 9d4e5f67..b628504e 100644 --- a/finch-java-client-okhttp/src/main/kotlin/com/tryfinch/api/client/okhttp/OkHttpClient.kt +++ b/finch-java-client-okhttp/src/main/kotlin/com/tryfinch/api/client/okhttp/OkHttpClient.kt @@ -33,7 +33,13 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val private fun getClient(requestOptions: RequestOptions): okhttp3.OkHttpClient { val timeout = requestOptions.timeout ?: return okHttpClient - return okHttpClient.newBuilder().callTimeout(timeout).build() + return okHttpClient + .newBuilder() + .connectTimeout(timeout) + .readTimeout(timeout) + .writeTimeout(timeout) + .callTimeout(if (timeout.seconds == 0L) timeout else timeout.plusSeconds(30)) + .build() } override fun execute( @@ -177,7 +183,13 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val fun build(): OkHttpClient { return OkHttpClient( - okhttp3.OkHttpClient.Builder().callTimeout(timeout).proxy(proxy).build(), + okhttp3.OkHttpClient.Builder() + .connectTimeout(timeout) + .readTimeout(timeout) + .writeTimeout(timeout) + .callTimeout(if (timeout.seconds == 0L) timeout else timeout.plusSeconds(30)) + .proxy(proxy) + .build(), checkNotNull(baseUrl) { "`baseUrl` is required but was not set" }, ) }