Limework/RedisBungee
2
0
Fork 0
mirror of https://github.com/proxiodev/RedisBungee.git synced 2024-11-23 04:28:01 +00:00
Code Releases Activity

There seems to be a bug in the BungeeCord scheduler, cancelling all tasks for a plugin doesn't cancel all tasks for a plugin.

Browse Source
This commit is contained in:
vemacs 2014-11-26 09:28:50 -07:00
parent 7df764c418
commit e483b9abeb
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
View File

@ -16,6 +16,7 @@ import lombok.Getter;
import lombok.NonNull; import lombok.NonNull;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.api.scheduler.ScheduledTask;
import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.Configuration;
import net.md_5.bungee.config.ConfigurationProvider; import net.md_5.bungee.config.ConfigurationProvider;
import net.md_5.bungee.config.YamlConfiguration; import net.md_5.bungee.config.YamlConfiguration;
@ -57,6 +58,9 @@ public final class RedisBungee extends Plugin {
private ExecutorService service; private ExecutorService service;
private List<String> serverIds; private List<String> serverIds;
private AtomicInteger nagAboutServers = new AtomicInteger(); private AtomicInteger nagAboutServers = new AtomicInteger();
private ScheduledTask integrityCheck;
private ScheduledTask heartbeatTask;
/** /**
* Fetch the {@link RedisBungeeAPI} object created on plugin start. * Fetch the {@link RedisBungeeAPI} object created on plugin start.
@ -125,7 +129,7 @@ public final class RedisBungee extends Plugin {
Jedis rsc; Jedis rsc;
try { try {
rsc = pool.getResource(); rsc = pool.getResource();
} catch (IllegalStateException ignored) { // handle pings after pool shutdown with 0 } catch (JedisConnectionException ignored) { // handle pings after pool shutdown with 0
return c; return c;
} }
try { try {
@ -242,7 +246,7 @@ public final class RedisBungee extends Plugin {
} }
serverIds = getCurrentServerIds(); serverIds = getCurrentServerIds();
uuidTranslator = new UUIDTranslator(this); uuidTranslator = new UUIDTranslator(this);
getProxy().getScheduler().schedule(this, new Runnable() { heartbeatTask = getProxy().getScheduler().schedule(this, new Runnable() {
@Override @Override
public void run() { public void run() {
Jedis rsc = pool.getResource(); Jedis rsc = pool.getResource();
@ -274,7 +278,7 @@ public final class RedisBungee extends Plugin {
getProxy().getPluginManager().registerListener(this, dataManager); getProxy().getPluginManager().registerListener(this, dataManager);
psl = new PubSubListener(); psl = new PubSubListener();
getProxy().getScheduler().runAsync(this, psl); getProxy().getScheduler().runAsync(this, psl);
getProxy().getScheduler().schedule(this, new Runnable() { integrityCheck = getProxy().getScheduler().schedule(this, new Runnable() {
@Override @Override
public void run() { public void run() {
Jedis tmpRsc = pool.getResource(); Jedis tmpRsc = pool.getResource();
@ -327,6 +331,8 @@ public final class RedisBungee extends Plugin {
// Poison the PubSub listener // Poison the PubSub listener
psl.poison(); psl.poison();
getProxy().getScheduler().cancel(this); getProxy().getScheduler().cancel(this);
integrityCheck.cancel();
heartbeatTask.cancel();
getLogger().info("Waiting for all tasks to finish."); getLogger().info("Waiting for all tasks to finish.");