Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

first add feeds from the queue, then if needed fetch feeds from the database to fill the batch

Browse Source
This commit is contained in:
Athou
2013-12-10 11:07:39 +01:00
parent e69785bb89
commit b29540b14e
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/commafeed/backend/feeds/FeedRefreshTaskGiver.java
View File

@@ -147,22 +147,25 @@ public class FeedRefreshTaskGiver {
*/ */
private void refill() { private void refill() {
refill.mark(); refill.mark();
int count = Math.min(100, 3 * backgroundThreads);
// first, get feeds that are up to refresh from the database
List<FeedRefreshContext> contexts = Lists.newArrayList(); List<FeedRefreshContext> contexts = Lists.newArrayList();
if (!applicationSettingsService.get().isCrawlingPaused()) { int batchSize = Math.min(100, 3 * backgroundThreads);
List<Feed> feeds = feedDAO.findNextUpdatable(count, getLastLoginThreshold());
for (Feed feed : feeds) { // add feeds we got from the add() method
contexts.add(new FeedRefreshContext(feed, false)); int addQueueSize = addQueue.size();
} for (int i = 0; i < Math.min(batchSize, addQueueSize); i++) {
contexts.add(addQueue.poll());
} }
// then, add to those the feeds we got from the add() method. We add them at the beginning of the list as they probably have a // add feeds that are up to refresh from the database
// higher priority if (!applicationSettingsService.get().isCrawlingPaused()) {
int size = addQueue.size(); int count = batchSize - contexts.size();
for (int i = 0; i < Math.min(count, size); i++) { if (count > 0) {
contexts.add(0, addQueue.poll()); List<Feed> feeds = feedDAO.findNextUpdatable(count, getLastLoginThreshold());
for (Feed feed : feeds) {
contexts.add(new FeedRefreshContext(feed, false));
}
}
} }
// set the disabledDate to now as we use the disabledDate in feedDAO to decide what to refresh next. We also use a map to remove // set the disabledDate to now as we use the disabledDate in feedDAO to decide what to refresh next. We also use a map to remove
@@ -178,8 +181,8 @@ public class FeedRefreshTaskGiver {
takeQueue.addAll(map.values()); takeQueue.addAll(map.values());
// add feeds from the giveBack queue to the map, overriding duplicates // add feeds from the giveBack queue to the map, overriding duplicates
size = giveBackQueue.size(); int giveBackQueueSize = giveBackQueue.size();
for (int i = 0; i < size; i++) { for (int i = 0; i < giveBackQueueSize; i++) {
Feed feed = giveBackQueue.poll(); Feed feed = giveBackQueue.poll();
map.put(feed.getId(), new FeedRefreshContext(feed, false)); map.put(feed.getId(), new FeedRefreshContext(feed, false));
} }