Adjust redis handler to handle multiple listeners

Author: BenCodez

SimpleAPI/src/main/java/com/bencodez/simpleapi/servercomm/redis/RedisHandler.java

@@ -1,12 +1,17 @@
 package com.bencodez.simpleapi.servercomm.redis;
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
 
 public abstract class RedisHandler {
 	private final JedisPool publishPool;
 	private final JedisPool subscribePool;
+	
+	private final Map<RedisListener, Thread> listenerThreads = new ConcurrentHashMap<>();
 
 	public RedisHandler(String host, int port, String username, String password) {
 		int timeout = 2000; // Set a reasonable timeout
@@ -23,31 +28,49 @@ public RedisHandler(String host, int port, String username, String password) {
 	}
 
 	public void close() {
-		try {
-			if (subscribeThread != null && subscribeThread.isAlive()) {
-				subscribeThread.interrupt(); // Signal the thread to stop
+		debug("Shutting down RedisHandler");
+
+		// Unsubscribe all listeners and stop threads
+		for (Map.Entry<RedisListener, Thread> entry : listenerThreads.entrySet()) {
+			RedisListener listener = entry.getKey();
+			Thread thread = entry.getValue();
+
+			try {
+				debug("Unsubscribing Redis listener on channel: " + listener.getChannel());
+				listener.unsubscribe(); // Gracefully signal jedis.subscribe() to exit
+			} catch (Exception e) {
+				debug("Failed to unsubscribe listener: " + e.getMessage());
+			}
+
+			try {
+				if (thread != null && thread.isAlive()) {
+					thread.join(2000); // Give up to 2 seconds for it to shut down
+				}
+			} catch (InterruptedException e) {
+				debug("Interrupted while waiting for Redis listener thread to finish: " + e.getMessage());
 			}
-		} catch (Exception e) {
-			debug("Failed to interrupt Redis subscribe thread: " + e.getMessage());
 		}
-		
-		
+
+		listenerThreads.clear();
+
+		// Close Redis pools
 		publishPool.close();
 		subscribePool.close();
 	}
 
-	private Thread subscribeThread;
-
 	public void loadListener(RedisListener listener) {
-		subscribeThread = new Thread(() -> {
+		Thread thread = new Thread(() -> {
 			try (Jedis jedis = subscribePool.getResource()) {
+				debug("Starting Redis subscription for channel: " + listener.getChannel());
 				jedis.subscribe(listener, listener.getChannel());
 			} catch (Exception e) {
-				debug("Redis subscribe error: " + e.getMessage());
+				debug("Redis subscribe error on channel " + listener.getChannel() + ": " + e.getMessage());
 			}
-		}, "RedisSubscribeThread");
+		}, "RedisSubscribeThread-" + listener.getChannel());
 
-		subscribeThread.start();
+		thread.setDaemon(true);
+		listenerThreads.put(listener, thread);
+		thread.start();
 	}
 
 	public abstract void debug(String message);