garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

tweaking for feeds returning 304

Browse Source
This commit is contained in:
Athou
2013-06-04 13:50:23 +02:00
parent d4546409e5
commit 1445486d4b
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
View File

@@ -85,7 +85,6 @@ public class FeedRefreshWorker {
private void update(Feed feed) {
try {
FetchedFeed fetchedFeed = fetcher.fetch(feed.getUrl(), false,
feed.getLastModifiedHeader(), feed.getEtagHeader());
@@ -114,13 +113,24 @@ public class FeedRefreshWorker {
} catch (NotModifiedException e) {
log.debug("Feed not modified (304) : " + feed.getUrl());
List<FeedEntry> feedEntries = feedEntryDAO.findByFeed(feed, 0, 10);
Date publishedDate = null;
if (feedEntries.size() > 0) {
publishedDate = feedEntries.get(0).getInserted();
feed.setErrorCount(0);
feed.setMessage(null);
Date disabledUntil = null;
if (applicationSettingsService.get().isHeavyLoad()) {
List<FeedEntry> feedEntries = feedEntryDAO.findByFeed(feed, 0,
10);
Date publishedDate = null;
if (feedEntries.size() > 0) {
publishedDate = feedEntries.get(0).getInserted();
}
disabledUntil = FeedUtils.buildDisabledUntil(publishedDate,
feedEntries);
}
feed.setDisabledUntil(FeedUtils.buildDisabledUntil(publishedDate,
feedEntries));
feed.setDisabledUntil(disabledUntil);
taskGiver.giveBack(feed);
} catch (Exception e) {
String message = "Unable to refresh feed " + feed.getUrl() + " : "