From 928a45e48e65b7a686c153bb3f9c6afda3bf9a57 Mon Sep 17 00:00:00 2001 From: Athou Date: Wed, 25 Feb 2015 15:14:01 +0100 Subject: [PATCH] skip entries that were deleted by the cleanup task --- .../java/com/commafeed/backend/feed/FeedRefreshWorker.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java b/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java index 6c9ae34f..e044aa1a 100644 --- a/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java +++ b/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java @@ -5,6 +5,7 @@ import io.dropwizard.lifecycle.Managed; import java.util.Date; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; import javax.inject.Inject; import javax.inject.Singleton; @@ -90,6 +91,11 @@ public class FeedRefreshWorker implements Managed { // stops here if NotModifiedException or any other exception is thrown List entries = fetchedFeed.getEntries(); + Integer maxFeedCapacity = config.getApplicationSettings().getMaxFeedCapacity(); + if (maxFeedCapacity > 0) { + entries = entries.stream().limit(maxFeedCapacity).collect(Collectors.toList()); + } + if (config.getApplicationSettings().getHeavyLoad()) { disabledUntil = FeedUtils.buildDisabledUntil(fetchedFeed.getFeed().getLastEntryDate(), fetchedFeed.getFeed() .getAverageEntryInterval(), disabledUntil);