Skip to content

Commit fb1347f

Browse files
committed
Move safe logic outside try catch
1 parent ef68805 commit fb1347f

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

src/main/java/com/github/stickerifier/stickerify/bot/Stickerify.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -235,27 +235,27 @@ private <T extends BaseRequest<T, R>, R extends BaseResponse> R execute(BaseRequ
235235

236236
for (int retry = 1; retry <= 3 && isRetriable(response.parameters()); retry++) {
237237
var retryDelay = response.parameters().retryAfter();
238-
LOGGER.at(Level.WARN).log("The {} request failed, retrying in {} seconds", request.getMethod(), retryDelay);
238+
LOGGER.at(Level.WARN).log("The {} request failed: retrying in {} seconds", request.getMethod(), retryDelay);
239239

240240
try {
241241
Thread.sleep(Duration.ofSeconds(retryDelay));
242-
243-
response = bot.execute(request);
244-
245-
if (response.isOk()) {
246-
return response;
247-
}
248242
} catch (InterruptedException _) {
249243
Thread.currentThread().interrupt();
250244
break;
251245
}
246+
247+
response = bot.execute(request);
248+
249+
if (response.isOk()) {
250+
return response;
251+
}
252252
}
253253

254254
throw new TelegramApiException(request.getMethod(), response.description());
255255
}
256256

257257
private static boolean isRetriable(@Nullable ResponseParameters parameters) {
258-
return parameters != null && parameters.retryAfter() != null && parameters.retryAfter() > 0;
258+
return parameters != null && parameters.retryAfter() != null && parameters.retryAfter() >= 0;
259259
}
260260

261261
private static void deleteTempFiles(Set<Path> pathsToDelete) {

0 commit comments

Comments
 (0)