Limework/RediSkript
2
1
Fork 1
Code Issues 2 Pull Requests Projects Releases 13 Wiki Activity

new ConnectionController! #11

Merged
ham1255 merged 4 commits from patch-1 into master 2020-12-26 10:04:19 +00:00
Conversation 1 Commits 4 Files Changed 6 +17 -5
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 029222a068 - Show all commits

14
src/main/java/net/limework/rediskript/RediSkript.java
View File

@ -10,6 +10,7 @@ import net.limework.rediskript.commands.CommandReloadRedis;
import net.limework.rediskript.events.RedisMessageEvent; import net.limework.rediskript.events.RedisMessageEvent;
import net.limework.rediskript.managers.RedisController; import net.limework.rediskript.managers.RedisController;
import net.limework.rediskript.skript.elements.*; import net.limework.rediskript.skript.elements.*;
import org.bukkit.ChatColor;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import java.io.IOException; import java.io.IOException;
@ -18,11 +19,21 @@ public class RediSkript extends JavaPlugin {
private RedisController redisController; private RedisController redisController;
public void reloadRedis(){ public void reloadRedis() {
redisController.shutdown(); redisController.shutdown();
redisController = new RedisController(this); redisController = new RedisController(this);
} }
public void sendLogs(String message) {
getLogger().info(
ChatColor.translateAlternateColorCodes('&', "&b[RediSkript]&e " + message)
);
}
public void sendErrorLogs(String message) {
getLogger().severe(
ChatColor.translateAlternateColorCodes('&', "&b[RediSkript]&c " + message)
);
}
public void registerSyntax() { public void registerSyntax() {
SkriptAddon addon = Skript.registerAddon(this); SkriptAddon addon = Skript.registerAddon(this);
@ -69,6 +80,7 @@ public class RediSkript extends JavaPlugin {
public void onDisable() { public void onDisable() {
if (redisController != null) redisController.shutdown(); if (redisController != null) redisController.shutdown();
} }
public RedisController getRC() { public RedisController getRC() {
return redisController; return redisController;
} }

8
src/main/java/net/limework/rediskript/managers/RedisController.java
View File

@ -34,7 +34,7 @@ public class RedisController extends BinaryJedisPubSub implements Runnable {
private final AtomicBoolean isConnectionBroken; private final AtomicBoolean isConnectionBroken;
private final RediSkript plugin; private final RediSkript plugin;
private BukkitTask ConnectionTask; private final BukkitTask ConnectionTask;
public RedisController(RediSkript plugin) { public RedisController(RediSkript plugin) {
@ -67,15 +67,15 @@ public class RedisController extends BinaryJedisPubSub implements Runnable {
if (!isConnectionBroken.get()) { if (!isConnectionBroken.get()) {
return; return;
} }
System.out.println("connecting to redis!"); plugin.sendLogs("Connecting to redis......");
try (Jedis jedis = jedisPool.getResource()) { try (Jedis jedis = jedisPool.getResource()) {
isConnectionBroken.set(false); isConnectionBroken.set(false);
System.out.println("connected to redis!"); plugin.sendLogs("&aConnection to redis has established!");
jedis.subscribe(this, channelsInByte); jedis.subscribe(this, channelsInByte);
} catch (Exception e) { } catch (Exception e) {
isConnectionBroken.set(true); isConnectionBroken.set(true);
e.printStackTrace(); plugin.sendLogs("Connection has &kFAILED &cor Unable to connect to redis retrying to make connection...");
} }
} }