Merge pull request #36 from Moehritz/fix

fix automatic pubsub reconnect in case of network issues
2024-11-22 20:28:00 +00:00 · 2016-03-10 22:03:14 -05:00 · 2016-03-10 22:03:14 -05:00 · 3a1362fd7a
commit 3a1362fd7a
parent 88e0aa64a0 b71dbd8283
1 changed files with 8 additions and 1 deletions
--- a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
+++ b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
@ -518,7 +518,14 @@ public final class RedisBungee extends Plugin {
                    // FIXME: Extremely ugly hack
                    // Attempt to unsubscribe this instance and try again.
                    getLogger().log(Level.INFO, "PubSub error, attempting to recover.", e);
-                    jpsh.unsubscribe();
+                    try {
+                        jpsh.unsubscribe();
+                    } catch (Exception e1) {
+                        /* This may fail with
+                        - java.net.SocketException: Broken pipe
+                        - redis.clients.jedis.exceptions.JedisConnectionException: JedisPubSub was not subscribed to a Jedis instance
+                        */
+                    }
                    broken = true;
                }
            }