From 9bf0fe7bb9ac56e0fc8aef30fa553f65d3df2ce3 Mon Sep 17 00:00:00 2001
From: William <will27528@gmail.com>
Date: Sat, 5 Feb 2022 15:15:04 +0000
Subject: [PATCH] Use a continuous connection for pub/sub to avoid
 EndOfStreamException and increase exception logging verbosity

---
 .../husksync/redis/RedisListener.java         | 71 ++++++++++++-------
 1 file changed, 44 insertions(+), 27 deletions(-)

diff --git a/common/src/main/java/me/william278/husksync/redis/RedisListener.java b/common/src/main/java/me/william278/husksync/redis/RedisListener.java
index 6288476f..7f4dcf42 100644
--- a/common/src/main/java/me/william278/husksync/redis/RedisListener.java
+++ b/common/src/main/java/me/william278/husksync/redis/RedisListener.java
@@ -2,6 +2,7 @@ package me.william278.husksync.redis;
 
 import me.william278.husksync.Settings;
 import redis.clients.jedis.*;
+import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.exceptions.JedisException;
 
 import java.io.IOException;
@@ -68,37 +69,53 @@ public abstract class RedisListener {
      */
     public final void listen() {
         new Thread(() -> {
-            try (Jedis jedis = getJedisConnection()) {
-                if (jedis.isConnected()) {
-                    isActiveAndEnabled = true;
-                    log(Level.INFO, "Enabled Redis listener successfully!");
+            isActiveAndEnabled = true;
+            while (isActiveAndEnabled) {
+
+                Jedis subscriber;
+                if (Settings.redisPassword.isEmpty()) {
+                    subscriber = new Jedis(Settings.redisHost,
+                            Settings.redisPort,
+                            0);
                 } else {
-                    isActiveAndEnabled = false;
-                    log(Level.SEVERE, """
-                            Failed to establish connection to the Redis server.
-                            HuskSync will now abort initialization.
-                            Please check the credentials are correct and restart your server.""");
-                    return;
+                    final JedisClientConfig config = DefaultJedisClientConfig.builder()
+                            .password(Settings.redisPassword)
+                            .timeoutMillis(0).build();
+
+                    subscriber = new Jedis(Settings.redisHost,
+                            Settings.redisPort,
+                            config);
                 }
-                jedis.subscribe(new JedisPubSub() {
-                    @Override
-                    public void onMessage(String channel, String message) {
-                        // Only accept messages to the HuskSync channel
-                        if (!channel.equals(RedisMessage.REDIS_CHANNEL)) {
-                            return;
-                        }
+                subscriber.connect();
 
-                        // Handle the message
-                        try {
-                            handleMessage(new RedisMessage(message));
-                        } catch (IOException | ClassNotFoundException e) {
-                            log(Level.SEVERE, "Failed to deserialize message target");
+                log(Level.INFO, "Enabled Redis listener successfully!");
+                try {
+                    subscriber.subscribe(new JedisPubSub() {
+                        @Override
+                        public void onMessage(String channel, String message) {
+                            // Only accept messages to the HuskSync channel
+                            if (!channel.equals(RedisMessage.REDIS_CHANNEL)) {
+                                return;
+                            }
+
+                            // Handle the message
+                            try {
+                                handleMessage(new RedisMessage(message));
+                            } catch (IOException | ClassNotFoundException e) {
+                                log(Level.SEVERE, "Failed to deserialize message target");
+                            }
                         }
-                    }
-                }, RedisMessage.REDIS_CHANNEL);
-            } catch (JedisException | IllegalStateException e) {
-                log(Level.SEVERE, "An exception occurred with the Jedis Subscriber!");
-                isActiveAndEnabled = false;
+                    }, RedisMessage.REDIS_CHANNEL);
+                } catch (JedisConnectionException connectionException) {
+                    log(Level.SEVERE, "A connection exception occurred with the Jedis listener");
+                    connectionException.printStackTrace();
+                } catch (JedisException jedisException) {
+                    isActiveAndEnabled = false;
+                    log(Level.SEVERE, "An exception occurred with the Jedis listener");
+                    jedisException.printStackTrace();
+                } finally {
+                    subscriber.close();
+                }
             }
         }, "Redis Subscriber").start();
     }