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

handle background threads ourselves, leave the stateless pool intact

Browse Source
This commit is contained in:
Athou
2013-04-23 10:51:05 +02:00
parent 3dd5f8375a
commit 5c4df4e451
4 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,8 +2,6 @@ package com.commafeed.backend;
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
import java.util.concurrent.Future;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -11,12 +9,16 @@ import javax.ejb.ConcurrencyManagement;
import javax.ejb.ConcurrencyManagementType;
import javax.ejb.Singleton;
import javax.ejb.Startup;
import javax.enterprise.inject.Instance;
import javax.inject.Inject;
import org.apache.commons.lang.mutable.MutableBoolean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import scala.actors.threadpool.ExecutorService;
import scala.actors.threadpool.Executors;
import com.commafeed.backend.dao.FeedCategoryDAO;
import com.commafeed.backend.dao.FeedDAO;
import com.commafeed.backend.dao.FeedSubscriptionDAO;
@@ -26,7 +28,6 @@ import com.commafeed.backend.model.ApplicationSettings;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.backend.services.ApplicationSettingsService;
import com.commafeed.backend.services.UserService;
import com.google.api.client.util.Lists;
@Startup
@Singleton
@@ -56,12 +57,11 @@ public class StartupBean {
ApplicationSettingsService applicationSettingsService;
@Inject
FeedRefreshWorker worker;
private List<Future<Void>> threads = Lists.newArrayList();
Instance<FeedRefreshWorker> workers;
private long startupTime;
private ExecutorService executor;
private MutableBoolean running = new MutableBoolean(true);
@PostConstruct
@@ -72,11 +72,19 @@ public class StartupBean {
}
ApplicationSettings settings = applicationSettingsService.get();
log.info("Starting {} background threads",
settings.getBackgroundThreads());
for (int i = 0; i < settings.getBackgroundThreads(); i++) {
Future<Void> thread = worker.start(running, "Thread " + i);
threads.add(thread);
int threads = settings.getBackgroundThreads();
log.info("Starting {} background threads", threads);
executor = Executors.newFixedThreadPool(threads);
for (int i = 0; i < threads; i++) {
final int threadId = i;
executor.execute(new Runnable() {
@Override
public void run() {
FeedRefreshWorker worker = workers.get();
worker.start(running, "Thread " + threadId);
}
});
}
}
@@ -96,6 +104,14 @@ public class StartupBean {
@PreDestroy
public void shutdown() {
running.setValue(false);
executor.shutdownNow();
while (!executor.isTerminated()) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
log.error("interrupted while waiting for threads to finish.");
}
}
}
}