|
|
@@ -80,11 +80,12 @@ public class HttpFetcherImpl implements HttpFetcher, HttpRequestRetryStrategy {
|
|
|
|
private CloseableHttpClient createClient() throws NoSuchAlgorithmException {
|
|
|
|
private CloseableHttpClient createClient() throws NoSuchAlgorithmException {
|
|
|
|
final ConnectionConfig connectionConfig = ConnectionConfig.custom()
|
|
|
|
final ConnectionConfig connectionConfig = ConnectionConfig.custom()
|
|
|
|
.setSocketTimeout(10, TimeUnit.SECONDS)
|
|
|
|
.setSocketTimeout(10, TimeUnit.SECONDS)
|
|
|
|
.setConnectTimeout(10, TimeUnit.SECONDS)
|
|
|
|
.setConnectTimeout(30, TimeUnit.SECONDS)
|
|
|
|
.build();
|
|
|
|
.build();
|
|
|
|
|
|
|
|
|
|
|
|
final PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create()
|
|
|
|
final PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create()
|
|
|
|
.setMaxConnPerRoute(4)
|
|
|
|
.setMaxConnPerRoute(2)
|
|
|
|
|
|
|
|
.setMaxConnTotal(5000)
|
|
|
|
.setDefaultConnectionConfig(connectionConfig)
|
|
|
|
.setDefaultConnectionConfig(connectionConfig)
|
|
|
|
.setTlsSocketStrategy(new DefaultClientTlsStrategy(SSLContext.getDefault()))
|
|
|
|
.setTlsSocketStrategy(new DefaultClientTlsStrategy(SSLContext.getDefault()))
|
|
|
|
.build();
|
|
|
|
.build();
|
|
|
@@ -418,7 +419,7 @@ public class HttpFetcherImpl implements HttpFetcher, HttpRequestRetryStrategy {
|
|
|
|
case HttpFetchResult.ResultOk ok -> logger.info(crawlerAuditMarker, "Fetch result OK {} for {}", ok.statusCode(), url);
|
|
|
|
case HttpFetchResult.ResultOk ok -> logger.info(crawlerAuditMarker, "Fetch result OK {} for {}", ok.statusCode(), url);
|
|
|
|
case HttpFetchResult.ResultRedirect redirect -> logger.info(crawlerAuditMarker, "Fetch result redirect: {} for {}", redirect.url(), url);
|
|
|
|
case HttpFetchResult.ResultRedirect redirect -> logger.info(crawlerAuditMarker, "Fetch result redirect: {} for {}", redirect.url(), url);
|
|
|
|
case HttpFetchResult.ResultNone none -> logger.info(crawlerAuditMarker, "Fetch result none for {}", url);
|
|
|
|
case HttpFetchResult.ResultNone none -> logger.info(crawlerAuditMarker, "Fetch result none for {}", url);
|
|
|
|
case HttpFetchResult.ResultException ex -> logger.error(crawlerAuditMarker, "Fetch result exception: {} for {}", ex.getClass().getSimpleName(), url);
|
|
|
|
case HttpFetchResult.ResultException ex -> logger.error(crawlerAuditMarker, "Fetch result exception for " + url + ": {}", ex.ex());
|
|
|
|
case HttpFetchResult.Result304Raw raw -> logger.info(crawlerAuditMarker, "Fetch result: 304 Raw for {}", url);
|
|
|
|
case HttpFetchResult.Result304Raw raw -> logger.info(crawlerAuditMarker, "Fetch result: 304 Raw for {}", url);
|
|
|
|
case HttpFetchResult.Result304ReplacedWithReference ref -> logger.info(crawlerAuditMarker, "Fetch result: 304 With reference for {}", url);
|
|
|
|
case HttpFetchResult.Result304ReplacedWithReference ref -> logger.info(crawlerAuditMarker, "Fetch result: 304 With reference for {}", url);
|
|
|
|
}
|
|
|
|
}
|
|
|
@@ -613,7 +614,6 @@ public class HttpFetcherImpl implements HttpFetcher, HttpRequestRetryStrategy {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public TimeValue getRetryInterval(HttpRequest request, IOException exception, int executionCount, HttpContext context) {
|
|
|
|
public TimeValue getRetryInterval(HttpRequest request, IOException exception, int executionCount, HttpContext context) {
|
|
|
|
logger.info("Error", exception);
|
|
|
|
|
|
|
|
return TimeValue.ofSeconds(1);
|
|
|
|
return TimeValue.ofSeconds(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|