Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-09-24 13:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

configurable http client timeouts

Browse Source
This commit is contained in:
Athou
2024-08-16 21:12:54 +02:00
parent 1b1a3f49c1
commit 012ce71134
10 changed files with 118 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
commafeed-server/src/main/java/com/commafeed/backend/feed/FeedFetcher.java
View File

@@ -40,9 +40,7 @@ public class FeedFetcher {
Instant lastPublishedDate, String lastContentHash) throws FeedException, IOException, NotModifiedException {
log.debug("Fetching feed {}", feedUrl);
int timeout = 20000;
HttpResult result = getter.getBinary(feedUrl, lastModified, eTag, timeout);
HttpResult result = getter.getBinary(feedUrl, lastModified, eTag);
byte[] content = result.getContent();
FeedParserResult parserResult;
@@ -54,7 +52,7 @@ public class FeedFetcher {
if (org.apache.commons.lang3.StringUtils.isNotBlank(extractedUrl)) {
feedUrl = extractedUrl;
result = getter.getBinary(extractedUrl, lastModified, eTag, timeout);
result = getter.getBinary(extractedUrl, lastModified, eTag);
content = result.getContent();
parserResult = parser.parse(result.getUrlAfterRedirect(), content);
} else {
@@ -87,8 +85,7 @@ public class FeedFetcher {
etagHeaderValueChanged ? result.getETag() : null);
}
return new FeedFetcherResult(parserResult, result.getUrlAfterRedirect(), result.getLastModifiedSince(), result.getETag(), hash,
result.getDuration());
return new FeedFetcherResult(parserResult, result.getUrlAfterRedirect(), result.getLastModifiedSince(), result.getETag(), hash);
}
private static String extractFeedUrl(List<FeedURLProvider> urlProviders, String url, String urlContent) {
@@ -103,7 +100,7 @@ public class FeedFetcher {
}
public record FeedFetcherResult(FeedParserResult feed, String urlAfterRedirect, String lastModifiedHeader, String lastETagHeader,
String contentHash, long fetchDuration) {
String contentHash) {
}
}