Skip to content

Commit 741f43e

Browse files
committed
Set default connect and read timeout to 75 secs
1 parent 8457cdc commit 741f43e

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

library/src/main/java/com/pengrad/telegrambot/TelegramBot.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
import com.pengrad.telegrambot.request.BaseRequest;
99
import com.pengrad.telegrambot.request.GetUpdates;
1010
import com.pengrad.telegrambot.response.BaseResponse;
11+
import okhttp3.Interceptor;
12+
import okhttp3.OkHttpClient;
13+
import okhttp3.logging.HttpLoggingInterceptor;
1114

1215
import java.io.InputStream;
1316
import java.net.URL;
1417
import java.net.URLConnection;
15-
16-
import okhttp3.Interceptor;
17-
import okhttp3.OkHttpClient;
18-
import okhttp3.logging.HttpLoggingInterceptor;
18+
import java.util.concurrent.TimeUnit;
1919

2020
/**
2121
* Stas Parshin
@@ -128,7 +128,9 @@ public TelegramBot build() {
128128
}
129129

130130
private static OkHttpClient client(Interceptor interceptor) {
131-
OkHttpClient.Builder builder = new OkHttpClient.Builder();
131+
OkHttpClient.Builder builder = new OkHttpClient.Builder()
132+
.connectTimeout(75, TimeUnit.SECONDS)
133+
.readTimeout(75, TimeUnit.SECONDS);
132134
if (interceptor != null) builder.addInterceptor(interceptor);
133135
return builder.build();
134136
}

library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import okhttp3.OkHttpClient;
99
import okhttp3.Request;
1010
import okhttp3.Response;
11-
import okhttp3.logging.HttpLoggingInterceptor;
1211
import org.junit.Test;
1312

1413
import java.io.File;
@@ -22,7 +21,6 @@
2221
import java.nio.file.Path;
2322
import java.nio.file.Paths;
2423
import java.util.*;
25-
import java.util.concurrent.TimeUnit;
2624

2725
import static com.pengrad.telegrambot.request.ContentTypes.VIDEO_MIME_TYPE;
2826
import static org.junit.Assert.*;
@@ -94,12 +92,7 @@ public TelegramBotTest() throws IOException {
9492
testPassportData = System.getenv("TEST_PASSPORT_DATA");
9593
}
9694

97-
bot = new TelegramBot.Builder(token)
98-
.okHttpClient(new OkHttpClient.Builder()
99-
.addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
100-
.readTimeout(60, TimeUnit.SECONDS) // setWebhook with certificate fails with timeout exception
101-
.build())
102-
.build();
95+
bot = new TelegramBot.Builder(token).debug().build();
10396
chatId = Integer.parseInt(chat);
10497
groupId = Long.parseLong(group);
10598
}

0 commit comments

Comments
 (0)