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

make sure the entry has been updated

Browse Source
This commit is contained in:
Athou
2013-06-07 15:54:47 +02:00
parent a73d82bd6c
commit 27804db165
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@ public class FeedRefreshUpdater {
ApplicationSettings settings = applicationSettingsService.get(); ApplicationSettings settings = applicationSettingsService.get();
int threads = Math.max(settings.getDatabaseUpdateThreads(), 1); int threads = Math.max(settings.getDatabaseUpdateThreads(), 1);
log.info("Creating database pool with {} threads", threads); log.info("Creating database pool with {} threads", threads);
locks = Striped.lazyWeakLock(threads * 1000); locks = Striped.lazyWeakLock(threads * 100000);
pool = new ThreadPoolExecutor(threads, threads, 0, pool = new ThreadPoolExecutor(threads, threads, 0,
TimeUnit.MILLISECONDS, TimeUnit.MILLISECONDS,
queue = new ArrayBlockingQueue<Runnable>(500 * threads)); queue = new ArrayBlockingQueue<Runnable>(500 * threads));
@@ -140,6 +140,8 @@ public class FeedRefreshUpdater {
private boolean updateEntry(final Feed feed, final FeedEntry entry, private boolean updateEntry(final Feed feed, final FeedEntry entry,
final List<FeedSubscription> subscriptions) { final List<FeedSubscription> subscriptions) {
boolean success = false;
String key = StringUtils.trimToEmpty(entry.getGuid() + entry.getUrl()); String key = StringUtils.trimToEmpty(entry.getGuid() + entry.getUrl());
Lock lock = locks.get(key); Lock lock = locks.get(key);
boolean locked = false; boolean locked = false;
@@ -147,6 +149,7 @@ public class FeedRefreshUpdater {
locked = lock.tryLock(1, TimeUnit.MINUTES); locked = lock.tryLock(1, TimeUnit.MINUTES);
if (locked) { if (locked) {
feedUpdateService.updateEntry(feed, entry, subscriptions); feedUpdateService.updateEntry(feed, entry, subscriptions);
success = true;
} else { } else {
log.error("lock timeout for " + feed.getUrl() + " - " + key); log.error("lock timeout for " + feed.getUrl() + " - " + key);
} }
@@ -158,7 +161,7 @@ public class FeedRefreshUpdater {
lock.unlock(); lock.unlock();
} }
} }
return locked; return success;
} }
private void handlePubSub(final Feed feed) { private void handlePubSub(final Feed feed) {

8
src/main/java/com/commafeed/backend/pubsubhubbub/SubscriptionHandler.java
View File

@@ -36,6 +36,14 @@ public class SubscriptionHandler {
FeedDAO feedDAO; FeedDAO feedDAO;
public void subscribe(Feed feed) { public void subscribe(Feed feed) {
try {
// make sure the feed has been updated for the callback to work
Thread.sleep(30000);
} catch (InterruptedException e1) {
// do nothing
}
String hub = feed.getPushHub(); String hub = feed.getPushHub();
String topic = feed.getPushTopic(); String topic = feed.getPushTopic();
String publicUrl = FeedUtils String publicUrl = FeedUtils