From ed434211a113bbae1c5b87e62616589419138bc6 Mon Sep 17 00:00:00 2001
From: ham1255 <mohammedtgm.mohammedtgm@gmail.com>
Date: Sun, 10 May 2020 23:10:45 +0400
Subject: [PATCH] Added Reconnection for channels sub

---
 .idea/workspace.xml                           |  6 +-
 .../net/limework/skLimework/AddonPlugin.java  |  3 +-
 .../limework/skLimework/DoNotUse/Tester.java  | 29 ----------
 .../limework/skLimework/Events/RedisSub.java  | 55 +++++++++++++------
 .../skLimework/elements/EffSendMessage.java   |  9 +--
 5 files changed, 46 insertions(+), 56 deletions(-)
 delete mode 100644 src/main/java/net/limework/skLimework/DoNotUse/Tester.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2636830..71fd053 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,13 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="61139119-6327-48a6-9183-0df6346ed8d8" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/SkLimework_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/SkLimework_jar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/limework/skLimework/AddonPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/limework/skLimework/AddonPlugin.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/limework/skLimework/DoNotUse/Tester.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/net/limework/skLimework/Events/RedisSub.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/limework/skLimework/Events/RedisSub.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/net/limework/skLimework/elements/EffSendMessage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/limework/skLimework/elements/EffSendMessage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/config.yml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/main/java/net/limework/skLimework/AddonPlugin.java b/src/main/java/net/limework/skLimework/AddonPlugin.java
index 8ca0b06..6ff1377 100644
--- a/src/main/java/net/limework/skLimework/AddonPlugin.java
+++ b/src/main/java/net/limework/skLimework/AddonPlugin.java
@@ -67,6 +67,7 @@ public class AddonPlugin extends JavaPlugin {
                 this.getConfig().getBoolean("Redis.useSSL"));
         redisSub = new RedisSub(this, jedisPool.getResource(), this.getConfig().getStringList("Channels"));
         service = Executors.newFixedThreadPool(this.getConfig().getInt("Redis.Threads"));
+        service.execute(redisSub);
 
         Bukkit.getLogger().info("[Govindas limework Addon] was enabled!");
     }
@@ -74,7 +75,7 @@ public class AddonPlugin extends JavaPlugin {
 
     @Override
     public void onDisable(){
-       redisSub.unSubAndCloseConnection();
+       redisSub.shutdown();
        service.shutdown();
         try { service.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS); } catch (InterruptedException e) { e.printStackTrace(); }
         jedisPool.close();
diff --git a/src/main/java/net/limework/skLimework/DoNotUse/Tester.java b/src/main/java/net/limework/skLimework/DoNotUse/Tester.java
deleted file mode 100644
index 4b11c22..0000000
--- a/src/main/java/net/limework/skLimework/DoNotUse/Tester.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package net.limework.skLimework.DoNotUse;
-
-import org.json.JSONObject;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.JedisPoolConfig;
-import redis.clients.jedis.JedisPubSub;
-
-public class Tester {
-    public static void main(String[] args) throws InterruptedException {
-        JedisPoolConfig jconfig = new JedisPoolConfig();
-        jconfig.setMaxTotal(100);
-        jconfig.setMaxIdle(100);
-        jconfig.setMinIdle(1);
-        JedisPool d = new JedisPool(jconfig, "192.168.0.112", 6379, 400, "yHy0d2zdBlRmaSPj3CiBwEv5V3XxBTLTrCsGW7ntBnzhfxPxXJS6Q1aTtR6DSfAtCZr2VxWnsungXHTcF94a4bsWEpGAvjL6XMU");
-        Jedis dd = d.getResource();
-        JSONObject J = new JSONObject();
-        J.put("Message", "something::something::something");
-        int x = 0;
-        while (true) {
-            x++;
-            System.out.println(x);
-            dd.publish("fs", J.toString() );
-            if (x == 1000) break;
-            Thread.sleep(1000);
-
-        }
-    }
-}
diff --git a/src/main/java/net/limework/skLimework/Events/RedisSub.java b/src/main/java/net/limework/skLimework/Events/RedisSub.java
index b15d9d3..eaad179 100644
--- a/src/main/java/net/limework/skLimework/Events/RedisSub.java
+++ b/src/main/java/net/limework/skLimework/Events/RedisSub.java
@@ -10,27 +10,49 @@ import redis.clients.jedis.exceptions.JedisConnectionException;
 
 import java.util.List;
 
-public class RedisSub extends JedisPubSub {
+
+public class RedisSub extends JedisPubSub implements Runnable{
+
     private AddonPlugin plugin;
     private Jedis j;
+    private String[] channels;
+
     public RedisSub(AddonPlugin plugin, Jedis j, List<String> channels) {
         this.plugin = plugin;
         this.j = j;
-        String[] ss = channels.toArray(new String[0]);
-        plugin.getServer().getScheduler().runTaskAsynchronously(plugin,
-        () -> {
-
-            try{
-                this.j.subscribe(this, ss);
-            } catch (JedisConnectionException je){
-                this.unSubAndCloseConnection();
-                Bukkit.broadcastMessage("Redis Went down!");
-            }
-
-        });
-
+        this.channels = channels.toArray(new String[0]);
     }
 
+    @Override
+    public void run(){
+        try{
+            this.j.subscribe(this, channels);
+        } catch (JedisConnectionException je){
+            plugin.getLogger().warning("Lost connection to redis!");
+            newJedis();
+        }
+    }
+
+
+    private void newJedis() {
+        this.unsubscribe();
+        this.j.close();
+        while (true){
+            try {
+                plugin.getLogger().info("reconnecting to Redis!");
+                this.j = plugin.getJedisPool().getResource();
+                plugin.getLogger().info("Connected!");
+                break;
+            }catch (JedisConnectionException e){
+                plugin.getLogger().warning("reconnecting to Redis has Failed! retrying in 4 seconds!");
+                try { Thread.sleep(4000);}catch (InterruptedException ignored){}
+            }
+        }
+        plugin.getJedisExecutionService().execute(this);
+    }
+
+
+
     @Override
     public void onMessage(String channel, String message) {
         try {
@@ -44,8 +66,9 @@ public class RedisSub extends JedisPubSub {
 
     }
 
-    public void unSubAndCloseConnection(){
+    public void shutdown(){
         this.unsubscribe();
         j.close();
     }
-}
+
+}
\ No newline at end of file
diff --git a/src/main/java/net/limework/skLimework/elements/EffSendMessage.java b/src/main/java/net/limework/skLimework/elements/EffSendMessage.java
index 4e203bf..4c37b3e 100644
--- a/src/main/java/net/limework/skLimework/elements/EffSendMessage.java
+++ b/src/main/java/net/limework/skLimework/elements/EffSendMessage.java
@@ -35,11 +35,7 @@ public class EffSendMessage extends Effect {
             return;
         }
         plugin.getJedisExecutionService().execute(() -> {
-            Jedis j;
-            try {j = plugin.getJedisPool().getResource();}catch (JedisConnectionException e){
-                Bukkit.broadcastMessage("Redis is down!!! dont send messages");
-                return;
-            }
+            Jedis j = plugin.getJedisPool().getResource();
             JSONObject json = new JSONObject();
             try {
                 json.put("Message", message);
@@ -63,4 +59,5 @@ public class EffSendMessage extends Effect {
         this.message = (Expression<String>) expressions[1];
         return true;
     }
-}
+
+}
\ No newline at end of file