Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2025-01-17 05:41:35 +01:00
Code Issues Projects Releases Wiki Activity

Correctly close flatfile database connections on disable, catch all exceptions when performing initial data load

Browse Source
This commit is contained in:
Luck 2017-12-22 22:35:13 +00:00
parent cc3ddd51fd
commit 0b72507e2d
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
5 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java
View File

@ -271,7 +271,12 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
// run an update instantly. // run an update instantly.
getLog().info("Performing initial data load..."); getLog().info("Performing initial data load...");
try {
new UpdateTask(this, true).run(); new UpdateTask(this, true).run();
} catch (Exception e) {
e.printStackTrace();
}
// register tasks // register tasks
scheduler.asyncRepeating(new ExpireTemporaryTask(this), 60L); scheduler.asyncRepeating(new ExpireTemporaryTask(this), 60L);

5
bungee/src/main/java/me/lucko/luckperms/bungee/LPBungeePlugin.java
View File

@ -210,7 +210,12 @@ public class LPBungeePlugin extends Plugin implements LuckPermsPlugin {
// run an update instantly. // run an update instantly.
getLog().info("Performing initial data load..."); getLog().info("Performing initial data load...");
try {
new UpdateTask(this, true).run(); new UpdateTask(this, true).run();
} catch (Exception e) {
e.printStackTrace();
}
// register tasks // register tasks
scheduler.asyncRepeating(new ExpireTemporaryTask(this), 60L); scheduler.asyncRepeating(new ExpireTemporaryTask(this), 60L);

6
common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/connection/file/FlatfileConnectionFactory.java
View File

@ -39,7 +39,7 @@ abstract class FlatfileConnectionFactory extends AbstractConnectionFactory {
protected final File file; protected final File file;
private final ReentrantLock lock = new ReentrantLock(); private final ReentrantLock lock = new ReentrantLock();
private Connection connection; private NonClosableConnection connection;
FlatfileConnectionFactory(String name, File file) { FlatfileConnectionFactory(String name, File file) {
super(name); super(name);
@ -56,8 +56,8 @@ abstract class FlatfileConnectionFactory extends AbstractConnectionFactory {
@Override @Override
public void shutdown() throws Exception { public void shutdown() throws Exception {
if (connection != null && !connection.isClosed()) { if (connection != null) {
connection.close(); connection.shutdown();
} }
} }

4
common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/connection/file/NonClosableConnection.java
View File

@ -42,6 +42,10 @@ public final class NonClosableConnection implements Connection {
} }
public void shutdown() throws SQLException {
delegate.close();
}
private interface Exclude { private interface Exclude {
void close() throws SQLException; void close() throws SQLException;
} }

4
sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java
View File

@ -279,7 +279,11 @@ public class LPSpongePlugin implements LuckPermsPlugin {
// run an update instantly. // run an update instantly.
getLog().info("Performing initial data load..."); getLog().info("Performing initial data load...");
try {
new UpdateTask(this, true).run(); new UpdateTask(this, true).run();
} catch (Exception e) {
e.printStackTrace();
}
// register tasks // register tasks
scheduler.asyncRepeating(new ExpireTemporaryTask(this), 60L); scheduler.asyncRepeating(new ExpireTemporaryTask(this), 60L);