- Update jedis

- Fix command TX hang
laborcraft · Aug 8, 2024 · 4890730 · 4890730
1 parent 6d7d376
commit 4890730
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -107,7 +107,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>5.1.2</version>
+            <version>5.1.4</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

diff --git a/src/main/java/cz/foresttech/forestredis/bungee/commands/BungeeForestRedisCommand.java b/src/main/java/cz/foresttech/forestredis/bungee/commands/BungeeForestRedisCommand.java
@@ -6,6 +6,7 @@
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
+import redis.clients.jedis.Jedis;
 
 import java.util.Arrays;
 import java.util.List;
@@ -51,7 +52,13 @@ public void execute(CommandSender commandSender, String[] args) {
                         return;
                     }
                     ForestRedisBungee.getInstance().logger().info("[TX] Redis command: " + args[1] + " -> '" + cmd + "'");
-                    RedisManager.getAPI().getJedis().publish(args[1], cmd);
+                    ForestRedisBungee.getInstance().runAsync(() -> {
+                        try (Jedis jedis = RedisManager.getAPI().getJedis()) {
+                            jedis.publish(args[1], cmd);
+                        } catch (Exception e) {
+                            ForestRedisBungee.getInstance().logger().warning("Could not send message to the Redis server!");
+                        }
+                    });
                 } else {
                     commandSender.sendMessage("§2["+ForestRedisBungee.getInstance().getDescription().getName()+"] §7Channel '"+args[1]+"' is not whitelisted for sending commands!");
                 }

diff --git a/src/main/java/cz/foresttech/forestredis/spigot/commands/SpigotForestRedisCommand.java b/src/main/java/cz/foresttech/forestredis/spigot/commands/SpigotForestRedisCommand.java
@@ -1,12 +1,14 @@
 package cz.foresttech.forestredis.spigot.commands;
 
+import cz.foresttech.forestredis.bungee.ForestRedisBungee;
 import cz.foresttech.forestredis.shared.RedisManager;
 import cz.foresttech.forestredis.shared.adapter.CommandChannel;
 import cz.foresttech.forestredis.spigot.ForestRedisSpigot;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import redis.clients.jedis.Jedis;
 
 import java.util.Arrays;
 import java.util.List;
@@ -48,7 +50,13 @@ public boolean onCommand(CommandSender commandSender, Command command, String s,
                         return true;
                     }
                     ForestRedisSpigot.getInstance().logger().info("[TX] Redis command: " + args[1] + " -> '" + cmd + "'");
-                    RedisManager.getAPI().getJedis().publish(args[1], cmd);
+                    ForestRedisSpigot.getInstance().runAsync(() -> {
+                        try (Jedis jedis = RedisManager.getAPI().getJedis()) {
+                            jedis.publish(args[1], cmd);
+                        } catch (Exception e) {
+                            ForestRedisSpigot.getInstance().logger().warning("Could not send message to the Redis server!");
+                        }
+                    });
                 } else {
                     commandSender.sendMessage("§2["+ForestRedisSpigot.getInstance().getDescription().getName()+"] §7Channel '"+args[1]+"' is not whitelisted for sending commands!");
                 }