This release adds support for BungeeCord 1.13 and later, as well as a…

…dding support for recovering pub/sub channels and a version bump.
minecrafter · Apr 19, 2019 · 429ed39 · 429ed39
1 parent d5dcb7d
commit 429ed39
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.imaginarycode.minecraft</groupId>
     <artifactId>RedisBungee</artifactId>
-    <version>0.4</version>
+    <version>0.5</version>
 
     <repositories>
         <repository>

diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
@@ -368,6 +368,7 @@ public void run() {
                 }
             }, 0, 1, TimeUnit.MINUTES);
         }
+        getProxy().registerChannel("legacy:RedisBungee");
         getProxy().registerChannel("RedisBungee");
     }
 
@@ -501,13 +502,18 @@ public Void call() throws Exception {
     class PubSubListener implements Runnable {
         private JedisPubSubHandler jpsh;
 
+        private Set<String> addedChannels = new HashSet<String>();
+
         @Override
         public void run() {
             boolean broken = false;
             try (Jedis rsc = pool.getResource()) {
                 try {
                     jpsh = new JedisPubSubHandler();
-                    rsc.subscribe(jpsh, "redisbungee-" + configuration.getServerId(), "redisbungee-allservers", "redisbungee-data");
+                    addedChannels.add("redisbungee-" + configuration.getServerId());
+                    addedChannels.add("redisbungee-allservers");
+                    addedChannels.add("redisbungee-data");
+                    rsc.subscribe(jpsh, addedChannels.toArray(new String[0]));
                 } catch (Exception e) {
                     // FIXME: Extremely ugly hack
                     // Attempt to unsubscribe this instance and try again.
@@ -522,6 +528,9 @@ public void run() {
                     }
                     broken = true;
                 }
+            } catch (JedisConnectionException e) {
+                getLogger().log(Level.INFO, "PubSub error, attempting to recover in 5 secs.");
+                getProxy().getScheduler().schedule(RedisBungee.this, PubSubListener.this, 5, TimeUnit.SECONDS);
             }
 
             if (broken) {
@@ -530,14 +539,17 @@ public void run() {
         }
 
         public void addChannel(String... channel) {
+            addedChannels.addAll(Arrays.asList(channel));
             jpsh.subscribe(channel);
         }
 
         public void removeChannel(String... channel) {
+            addedChannels.removeAll(Arrays.asList(channel));
             jpsh.unsubscribe(channel);
         }
 
         public void poison() {
+            addedChannels.clear();
             jpsh.unsubscribe();
         }
     }

diff --git a/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeListener.java b/src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeListener.java
@@ -148,7 +148,8 @@ public void onPing(final ProxyPingEvent event) {
 
     @EventHandler
     public void onPluginMessage(final PluginMessageEvent event) {
-        if (event.getTag().equals("RedisBungee") && event.getSender() instanceof Server) {
+        if ((event.getTag().equals("legacy:RedisBungee") || event.getTag().equals("RedisBungee")) && event.getSender() instanceof Server) {
+            final String currentChannel = event.getTag();
             final byte[] data = Arrays.copyOf(event.getData(), event.getData().length);
             plugin.getProxy().getScheduler().runAsync(plugin, new Runnable() {
                 @Override
@@ -244,7 +245,7 @@ public void run() {
                             return;
                     }
 
-                    ((Server) event.getSender()).sendData("RedisBungee", out.toByteArray());
+                    ((Server) event.getSender()).sendData(currentChannel, out.toByteArray());
                 }
             });
         }

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: RedisBungee
 main: com.imaginarycode.minecraft.redisbungee.RedisBungee
-version: 0.3.10
-author: tuxed
-# This is used so that we can automagically override default BungeeCord behavior.
+version: 0.5
+author: chunkr
+# This is used so that we can automatically override default BungeeCord behavior.
 softDepends: ["cmd_find", "cmd_list"]