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

finer transactions

Browse Source
This commit is contained in:
Athou
2014-08-13 13:08:54 +02:00
parent 95bbcce941
commit f05515d7d6
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/commafeed/backend/feed/FeedRefreshUpdater.java
View File

@@ -100,18 +100,8 @@ public class FeedRefreshUpdater implements Managed {
@Override @Override
public void run() { public void run() {
new UnitOfWork<Void>(sessionFactory) {
@Override
protected Void runInSession() throws Exception {
internalRun();
return null;
}
}.run();
}
public void internalRun() {
boolean ok = true; boolean ok = true;
Feed feed = context.getFeed(); final Feed feed = context.getFeed();
List<FeedEntry> entries = context.getEntries(); List<FeedEntry> entries = context.getEntries();
if (entries.isEmpty()) { if (entries.isEmpty()) {
feed.setMessage("Feed has no entries"); feed.setMessage("Feed has no entries");
@@ -125,7 +115,12 @@ public class FeedRefreshUpdater implements Managed {
if (!lastEntries.contains(cacheKey)) { if (!lastEntries.contains(cacheKey)) {
log.debug("cache miss for {}", entry.getUrl()); log.debug("cache miss for {}", entry.getUrl());
if (subscriptions == null) { if (subscriptions == null) {
subscriptions = feedSubscriptionDAO.findByFeed(feed); subscriptions = new UnitOfWork<List<FeedSubscription>>(sessionFactory) {
@Override
protected List<FeedSubscription> runInSession() throws Exception {
return feedSubscriptionDAO.findByFeed(feed);
}
}.run();
} }
ok &= addEntry(feed, entry, subscriptions); ok &= addEntry(feed, entry, subscriptions);
entryCacheMiss.mark(); entryCacheMiss.mark();
@@ -190,7 +185,12 @@ public class FeedRefreshUpdater implements Managed {
locked1 = lock1.tryLock(1, TimeUnit.MINUTES); locked1 = lock1.tryLock(1, TimeUnit.MINUTES);
locked2 = lock2.tryLock(1, TimeUnit.MINUTES); locked2 = lock2.tryLock(1, TimeUnit.MINUTES);
if (locked1 && locked2) { if (locked1 && locked2) {
boolean inserted = feedUpdateService.addEntry(feed, entry); boolean inserted = new UnitOfWork<Boolean>(sessionFactory) {
@Override
protected Boolean runInSession() throws Exception {
return feedUpdateService.addEntry(feed, entry);
}
}.run();
if (inserted) { if (inserted) {
entryInserted.mark(); entryInserted.mark();
} }