Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-15 20:51:21 +01:00
Code Issues Projects Releases Wiki Activity

Increased database stop wait time: 5s -> 20s

Browse Source 
This is to give more time for unfinished data transactions to execute.
This commit is contained in:
Rsl1122 2019-02-28 12:47:37 +02:00
parent abc5296ee2
commit b9ec70619a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java
View File

@ -44,6 +44,7 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.*; import java.util.concurrent.*;
import java.util.function.BiFunction;
import java.util.function.Supplier; import java.util.function.Supplier;
/** /**
@ -111,7 +112,7 @@ public abstract class SQLDB extends AbstractDatabase {
} }
transactionExecutor.shutdown(); transactionExecutor.shutdown();
try { try {
if (!transactionExecutor.awaitTermination(5L, TimeUnit.SECONDS)) { if (!transactionExecutor.awaitTermination(20L, TimeUnit.SECONDS)) {
return transactionExecutor.shutdownNow(); return transactionExecutor.shutdownNow();
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
@ -213,7 +214,11 @@ public abstract class SQLDB extends AbstractDatabase {
accessLock.checkAccess(transaction); accessLock.checkAccess(transaction);
transaction.executeTransaction(this); transaction.executeTransaction(this);
return CompletableFuture.completedFuture(null); return CompletableFuture.completedFuture(null);
}, getTransactionExecutor()).handle((obj, throwable) -> { }, getTransactionExecutor()).handle(errorHandler(origin));
}
private BiFunction<CompletableFuture<Object>, Throwable, CompletableFuture<Object>> errorHandler(Exception origin) {
return (obj, throwable) -> {
if (throwable == null) { if (throwable == null) {
return CompletableFuture.completedFuture(null); return CompletableFuture.completedFuture(null);
} }
@ -224,8 +229,7 @@ public abstract class SQLDB extends AbstractDatabase {
errorHandler.log(L.ERROR, getClass(), throwable); errorHandler.log(L.ERROR, getClass(), throwable);
return CompletableFuture.completedFuture(null); return CompletableFuture.completedFuture(null);
}); };
} }
private ExecutorService getTransactionExecutor() { private ExecutorService getTransactionExecutor() {