Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-14 15:57:50 +02:00
Code Issues Projects Releases Wiki Activity

Fixed Task related Exceptions on ShutdownHook

Browse Source
This commit is contained in:
Rsl1122 2019-01-14 18:19:35 +02:00
parent b0562b5fb0
commit b9dd21609d
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/H2DB.java
View File

@ -104,10 +104,14 @@ public class H2DB extends SQLDB {
private void startConnectionPingTask() {
stopConnectionPingTask();
// Maintains Connection.
connectionPingTask = runnableFactory.create("DBConnectionPingTask " + getType().getName(),
new KeepAliveTask(connection, () -> getNewConnection(databaseFile), logger, errorHandler)
).runTaskTimerAsynchronously(60L * 20L, 60L * 20L);
try {
// Maintains Connection.
connectionPingTask = runnableFactory.create("DBConnectionPingTask " + getType().getName(),
new KeepAliveTask(connection, () -> getNewConnection(databaseFile), logger, errorHandler)
).runTaskTimerAsynchronously(60L * 20L, 60L * 20L);
} catch (Exception ignored) {
// Task failed to register because plugin is being disabled
}
}
private void stopConnectionPingTask() {

12
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/SQLiteDB.java
View File

@ -104,10 +104,14 @@ public class SQLiteDB extends SQLDB {
private void startConnectionPingTask() {
stopConnectionPingTask();
// Maintains Connection.
connectionPingTask = runnableFactory.create("DBConnectionPingTask " + getType().getName(),
new KeepAliveTask(connection, () -> getNewConnection(databaseFile), logger, errorHandler)
).runTaskTimerAsynchronously(60L * 20L, 60L * 20L);
try {
// Maintains Connection.
connectionPingTask = runnableFactory.create("DBConnectionPingTask " + getType().getName(),
new KeepAliveTask(connection, () -> getNewConnection(databaseFile), logger, errorHandler)
).runTaskTimerAsynchronously(60L * 20L, 60L * 20L);
} catch (Exception ignored) {
// Task failed to register because plugin is being disabled
}
}
private void stopConnectionPingTask() {

14
Plan/sponge/src/main/java/com/djrapitops/plan/system/database/databases/sql/SpongeMySQLDB.java
View File

@ -90,15 +90,19 @@ public class SpongeMySQLDB extends MySQLDB {
return super.getConnection();
} catch (SQLException e) {
if (e.getMessage().contains("has been closed")) {
try {
setupDataSource();
} catch (DBInitException setupException) {
throw new IllegalStateException("Failed to set up a new datasource after connection failure.", setupException);
}
restartDataSource();
return super.getConnection();
} else {
throw e;
}
}
}
private void restartDataSource() {
try {
setupDataSource();
} catch (DBInitException setupException) {
throw new IllegalStateException("Failed to set up a new datasource after connection failure.", setupException);
}
}
}