Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] ExecutorPool should use different pools for scheduledExecutors and ExecutorService

This commit is contained in:
Robert von Burg 2020-03-03 15:59:09 +01:00
parent 006a08a3d2
commit d5fd5018cd
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
li.strolch.utils/src/main/java/li/strolch/utils/ExecutorPool.java
View File

@ -18,9 +18,11 @@ public class ExecutorPool {
private static final Logger logger = LoggerFactory.getLogger(ExecutorPool.class);
private Map<String, ExecutorService> executors;
private Map<String, ScheduledExecutorService> scheduledExecutors;
public ExecutorPool() {
this.executors = Collections.synchronizedMap(new HashMap<>());
this.scheduledExecutors = Collections.synchronizedMap(new HashMap<>());
}
public ExecutorService getExecutor(String poolName) {
@ -35,7 +37,7 @@ public class ExecutorPool {
public ScheduledExecutorService getScheduledExecutor(String poolName) {
DBC.PRE.assertNotEmpty("poolName must be set!", poolName);
return (ScheduledExecutorService) this.executors
return this.scheduledExecutors
.computeIfAbsent(poolName, p -> newScheduledThreadPool(4, new NamedThreadPoolFactory(p)));
}
@ -45,16 +47,26 @@ public class ExecutorPool {
logger.info("Shutting down executor pool " + poolName);
ExecutorService executor = this.executors.get(poolName);
try {
executor.shutdown();
executor.awaitTermination(5, TimeUnit.SECONDS);
} catch (InterruptedException e) {
logger.error("Was interrupted while shutting down tasks");
} finally {
if (!executor.isTerminated()) {
logger.error("Tasks not stopped after " + 5 + "s. Shutting down now.");
executor.shutdownNow();
}
shutdownExecutor(executor);
}
for (String poolName : this.scheduledExecutors.keySet()) {
logger.info("Shutting down scheduled executor pool " + poolName);
ExecutorService executor = this.scheduledExecutors.get(poolName);
shutdownExecutor(executor);
}
}
private void shutdownExecutor(ExecutorService executor) {
try {
executor.shutdown();
executor.awaitTermination(5, TimeUnit.SECONDS);
} catch (InterruptedException e) {
logger.error("Was interrupted while shutting down tasks");
} finally {
if (!executor.isTerminated()) {
logger.error("Tasks not stopped after " + 5 + "s. Shutting down now.");
executor.shutdownNow();
}
}
}