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

added in memory cache and redis cache and marked them as application scoped

Browse Source
This commit is contained in:
Athou
2013-06-29 11:20:53 +02:00
parent c2af4de96b
commit 27e03e3038
7 changed files with 161 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,8 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import org.apache.commons.lang3.time.DateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.commafeed.backend.MetricsBean;
import com.commafeed.backend.dao.FeedDAO;
@@ -21,6 +23,8 @@ import com.google.common.collect.Queues;
@Singleton
public class FeedRefreshTaskGiver {
protected static final Logger log = LoggerFactory.getLogger(FeedRefreshTaskGiver.class);
@Inject
FeedDAO feedDAO;

25
src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
View File

@@ -31,6 +31,7 @@ import com.commafeed.backend.model.FeedSubscription;
import com.commafeed.backend.pubsubhubbub.SubscriptionHandler;
import com.commafeed.backend.services.ApplicationSettingsService;
import com.commafeed.backend.services.FeedUpdateService;
import com.google.api.client.util.Lists;
import com.google.common.util.concurrent.Striped;
@Singleton
@@ -141,9 +142,21 @@ public class FeedRefreshUpdater {
if (entries.isEmpty() == false) {
List<FeedSubscription> subscriptions = feedSubscriptionDAO
.findByFeed(feed);
List<String> lastEntries = cache.getLastEntries(feed);
List<String> currentEntries = Lists.newArrayList();
for (FeedEntry entry : entries) {
ok &= updateEntry(feed, entry, subscriptions);
String cacheKey = cache.buildKey(feed, entry);
if (!lastEntries.contains(cacheKey)) {
log.debug("cache miss for {}", entry.getUrl());
ok &= updateEntry(feed, entry, subscriptions);
metricsBean.entryCacheMiss();
} else {
log.debug("cache hit for {}", entry.getUrl());
metricsBean.entryCacheHit();
}
currentEntries.add(cacheKey);
}
cache.setLastEntries(feed, currentEntries);
}
if (applicationSettingsService.get().isPubsubhubbub()) {
@@ -171,15 +184,7 @@ public class FeedRefreshUpdater {
try {
locked = lock.tryLock(1, TimeUnit.MINUTES);
if (locked) {
if (!cache.hasFeedEntry(feed, entry)) {
log.debug("cache miss for {}", entry.getUrl());
feedUpdateService.updateEntry(feed, entry, subscriptions);
cache.putFeedEntry(feed, entry);
metricsBean.entryCacheMiss();
} else {
log.debug("cache hit for {}", entry.getUrl());
metricsBean.entryCacheHit();
}
feedUpdateService.updateEntry(feed, entry, subscriptions);
success = true;
} else {
log.error("lock timeout for " + feed.getUrl() + " - " + key);