Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-12-28 20:17:55 +01:00
Code Issues Projects Releases Wiki Activity

Fix redis close (#3353)

Browse Source
This commit is contained in:
Luck 2022-03-27 16:50:31 +01:00
parent 5647b2e5c6
commit 2e0a4d71a5
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/src/main/java/me/lucko/luckperms/common/messaging/redis/RedisMessenger.java
View File

@ -48,8 +48,9 @@ public class RedisMessenger implements Messenger {
private final LuckPermsPlugin plugin;
private final IncomingMessageConsumer consumer;
private JedisPool jedisPool;
private Subscription sub;
private /* final */ JedisPool jedisPool;
private /* final */ Subscription sub;
private boolean closing = false;
public RedisMessenger(LuckPermsPlugin plugin, IncomingMessageConsumer consumer) {
this.plugin = plugin;
@ -82,6 +83,7 @@ public class RedisMessenger implements Messenger {
@Override
public void close() {
this.closing = true;
this.sub.unsubscribe();
this.jedisPool.destroy();
}
@ -90,16 +92,21 @@ public class RedisMessenger implements Messenger {
@Override
public void run() {
boolean wasBroken = false;
while (!Thread.interrupted() && !RedisMessenger.this.jedisPool.isClosed()) {
boolean first = true;
while (!RedisMessenger.this.closing && !Thread.interrupted() && !RedisMessenger.this.jedisPool.isClosed()) {
try (Jedis jedis = RedisMessenger.this.jedisPool.getResource()) {
if (wasBroken) {
if (first) {
first = false;
} else {
RedisMessenger.this.plugin.getLogger().info("Redis pubsub connection re-established");
wasBroken = false;
}
jedis.subscribe(this, CHANNEL);
jedis.subscribe(this, CHANNEL); // blocking call
} catch (Exception e) {
wasBroken = true;
if (RedisMessenger.this.closing) {
return;
}
RedisMessenger.this.plugin.getLogger().warn("Redis pubsub connection dropped, trying to re-open the connection", e);
try {
unsubscribe();