dev add retry
Test Workflow / test (push) Waiting to run

This commit is contained in:
vladp
2026-02-21 23:45:54 +07:00
parent c289032671
commit 76b07db964
@@ -32,10 +32,10 @@ public class SearchImageService {
public SearchImageService() { public SearchImageService() {
this.httpClient = new OkHttpClient.Builder() this.httpClient = new OkHttpClient.Builder()
.connectTimeout(30, TimeUnit.SECONDS) .connectTimeout(18, TimeUnit.SECONDS)
.writeTimeout(30, TimeUnit.SECONDS) .writeTimeout(18, TimeUnit.SECONDS)
.readTimeout(30, TimeUnit.SECONDS) .readTimeout(18, TimeUnit.SECONDS)
.callTimeout(30, TimeUnit.SECONDS) .callTimeout(18, TimeUnit.SECONDS)
.retryOnConnectionFailure(true) .retryOnConnectionFailure(true)
.build(); .build();
@@ -96,7 +96,6 @@ public class SearchImageService {
} }
private String callReverseImageApiByUrl(String imageUrl, String engine, String searchType) throws IOException { private String callReverseImageApiByUrl(String imageUrl, String engine, String searchType) throws IOException {
if (searchApiKey == null || searchApiKey.isBlank()) { if (searchApiKey == null || searchApiKey.isBlank()) {
throw new IllegalStateException("SearchAPI key not configured"); throw new IllegalStateException("SearchAPI key not configured");
} }
@@ -115,12 +114,16 @@ public class SearchImageService {
.header("User-Agent", "Mozilla/5.0") .header("User-Agent", "Mozilla/5.0")
.build(); .build();
int maxAttempts = 3;
IOException lastException = null;
for (int attempt = 1; attempt <= maxAttempts; attempt++) {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
try (Response response = httpClient.newCall(request).execute()) { try (Response response = httpClient.newCall(request).execute()) {
long duration = System.currentTimeMillis() - start; long duration = System.currentTimeMillis() - start;
log.info("Yandex response code={}, duration={}ms", response.code(), duration); log.info("Yandex response code={}, duration={}ms, attempt={}",
response.code(), duration, attempt);
if (!response.isSuccessful()) { if (!response.isSuccessful()) {
throw new IOException("API error: " + response.code()); throw new IOException("API error: " + response.code());
@@ -132,8 +135,69 @@ public class SearchImageService {
} }
return body.string(); return body.string();
} catch (IOException e) {
lastException = e;
log.warn("Attempt {} failed for image: {}, error: {}",
attempt, imageUrl, e.getMessage());
if (attempt == maxAttempts) {
log.error("All {} attempts failed for image: {}", maxAttempts, imageUrl);
throw lastException;
}
try {
Thread.sleep(500L * attempt); // 500ms, 1000ms, 1500ms
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
throw new IOException("Retry interrupted", ie);
} }
} }
}
throw lastException;
}
// private String callReverseImageApiByUrl(String imageUrl, String engine, String searchType) throws IOException {
//
// if (searchApiKey == null || searchApiKey.isBlank()) {
// throw new IllegalStateException("SearchAPI key not configured");
// }
//
// HttpUrl url = HttpUrl.parse("https://searchapi.io/api/v1/search")
// .newBuilder()
// .addQueryParameter("engine", engine)
// .addQueryParameter("api_key", searchApiKey)
// .addQueryParameter("url", imageUrl)
// .addQueryParameter("search_type", searchType)
// .build();
//
// Request request = new Request.Builder()
// .url(url)
// .header("Accept", "application/json")
// .header("User-Agent", "Mozilla/5.0")
// .build();
//
// long start = System.currentTimeMillis();
//
// try (Response response = httpClient.newCall(request).execute()) {
//
// long duration = System.currentTimeMillis() - start;
// log.info("Yandex response code={}, duration={}ms", response.code(), duration);
//
// if (!response.isSuccessful()) {
// throw new IOException("API error: " + response.code());
// }
//
// ResponseBody body = response.body();
// if (body == null) {
// throw new IOException("Empty response body");
// }
//
// return body.string();
// }
// }
public List<YandexSearchResponse.ImageResult> getAllImagesWithoutPagination(String searchApiJson, String findType) public List<YandexSearchResponse.ImageResult> getAllImagesWithoutPagination(String searchApiJson, String findType)
throws IOException { throws IOException {