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

shutdown pool when application stops

Browse Source
This commit is contained in:
Athou
2013-05-24 12:28:48 +02:00
parent d148fa9df7
commit 8039915bcf
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/commafeed/backend/StartupBean.java
View File

@@ -27,6 +27,7 @@ import com.commafeed.backend.dao.FeedCategoryDAO;
import com.commafeed.backend.dao.FeedDAO;
import com.commafeed.backend.dao.FeedSubscriptionDAO;
import com.commafeed.backend.dao.UserDAO;
import com.commafeed.backend.feeds.FeedRefreshUpdater;
import com.commafeed.backend.feeds.FeedRefreshWorker;
import com.commafeed.backend.model.ApplicationSettings;
import com.commafeed.backend.model.UserRole.Role;
@@ -61,6 +62,9 @@ public class StartupBean {
@Inject
ApplicationSettingsService applicationSettingsService;
@Inject
FeedRefreshUpdater feedRefreshUpdater;
@Inject
Instance<FeedRefreshWorker> workers;
@@ -145,6 +149,7 @@ public class StartupBean {
log.error("interrupted while waiting for threads to finish.");
}
}
feedRefreshUpdater.shutdown();
}
}

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

@@ -78,6 +78,17 @@ public class FeedRefreshUpdater {
});
}
public void shutdown() {
pool.shutdownNow();
while (!pool.isTerminated()) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
log.error("interrupted while waiting for threads to finish.");
}
}
}
public void updateFeed(Feed feed, Collection<FeedEntry> entries) {
pool.execute(new Task(feed, entries));
}