mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-15 05:41:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Processing sometimes running processors on the main server thread

Browse Source
This commit is contained in:
Rsl1122 2018-07-19 14:11:16 +03:00
parent 38084bee63
commit 31e04bb080
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Plan/src/main/java/com/djrapitops/plan/system/processing/Processing.java
View File

@ -38,16 +38,22 @@ public class Processing implements SubSystem {
public static void submitNonCritical(Runnable runnable) {
saveInstance(runnable);
CompletableFuture.supplyAsync(() -> runnable, getInstance().nonCriticalExecutor)
.thenAccept(Runnable::run)
.handle(Processing::exceptionHandler);
ExecutorService executor = getInstance().nonCriticalExecutor;
if (executor.isShutdown()) {
return;
}
CompletableFuture.supplyAsync(() -> {
runnable.run();
return true;
}, executor).handle(Processing::exceptionHandler);
}
public static void submitCritical(Runnable runnable) {
saveInstance(runnable);
CompletableFuture.supplyAsync(() -> runnable, getInstance().criticalExecutor)
.thenAccept(Runnable::run)
.handle(Processing::exceptionHandler);
CompletableFuture.supplyAsync(() -> {
runnable.run();
return true;
}, getInstance().criticalExecutor).handle(Processing::exceptionHandler);
}
public static void submitNonCritical(Runnable... runnables) {
@ -72,15 +78,17 @@ public class Processing implements SubSystem {
public static <T> Future<T> submitNonCritical(Callable<T> task) {
saveInstance(task);
return CompletableFuture.supplyAsync(() -> task, getInstance().nonCriticalExecutor)
.thenApply(tCallable -> {
try {
return tCallable.call();
} catch (Exception e) {
throw new IllegalStateException(e);
}
})
.handle(Processing::exceptionHandler);
ExecutorService executor = getInstance().nonCriticalExecutor;
if (executor.isShutdown()) {
return null;
}
return CompletableFuture.supplyAsync(() -> {
try {
return task.call();
} catch (Exception e) {
throw new IllegalStateException(e);
}
}, getInstance().nonCriticalExecutor).handle(Processing::exceptionHandler);
}
private static <T> T exceptionHandler(T t, Throwable throwable) {
@ -92,15 +100,13 @@ public class Processing implements SubSystem {
public static <T> Future<T> submitCritical(Callable<T> task) {
saveInstance(task);
return CompletableFuture.supplyAsync(() -> task, getInstance().criticalExecutor)
.thenApply(tCallable -> {
try {
return tCallable.call();
} catch (Exception e) {
throw new IllegalStateException(e);
}
})
.handle(Processing::exceptionHandler);
return CompletableFuture.supplyAsync(() -> {
try {
return task.call();
} catch (Exception e) {
throw new IllegalStateException(e);
}
}, getInstance().criticalExecutor).handle(Processing::exceptionHandler);
}
public static Processing getInstance() {