kai1846456/RediSkript
1
0
Fork 0
forked from Limework/RediSkript
Code Pull Requests Activity

Revert "Update RedisManager.java"

Browse Source 
This reverts commit 6c5d580b16.
This commit is contained in:
Govindas 2020-10-24 12:32:36 +03:00
parent d443203c64
commit 625e7b0d83
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/limework/core/managers/RedisManager.java
View File

@ -60,9 +60,6 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
} }
public void start() { public void start() {
if (isShuttingDown.get()) {
isShuttingDown.set(false);
}
this.RedisService.execute(this); this.RedisService.execute(this);
} }
@ -151,10 +148,9 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
this.RedisService.shutdown(); this.RedisService.shutdown();
} }
public void reload() { public void reload() {
shutdown();
plugin.reloadConfig(); plugin.reloadConfig();
subscribeJedis.close();
Configuration config = this.plugin.getConfig(); Configuration config = this.plugin.getConfig();
JedisPoolConfig JConfig = new JedisPoolConfig(); JedisPoolConfig JConfig = new JedisPoolConfig();
JConfig.setMaxTotal(config.getInt("Redis.MaxConnections")); JConfig.setMaxTotal(config.getInt("Redis.MaxConnections"));
@ -167,7 +163,7 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
config.getInt("Redis.TimeOut"), config.getInt("Redis.TimeOut"),
config.getString("Redis.Password"), config.getString("Redis.Password"),
config.getBoolean("Redis.useSSL")); config.getBoolean("Redis.useSSL"));
RedisService.shutdown(); RedisService.shutdownNow();
RedisService = Executors.newFixedThreadPool(config.getInt("Redis.Threads")); RedisService = Executors.newFixedThreadPool(config.getInt("Redis.Threads"));
try { try {
this.subscribeJedis = this.jedisPool.getResource(); this.subscribeJedis = this.jedisPool.getResource();
@ -175,7 +171,6 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
} }
this.channels = config.getStringList("Channels"); this.channels = config.getStringList("Channels");
encryption = new Encryption(config); encryption = new Encryption(config);
start();
} }
public JedisPool getJedisPool() { public JedisPool getJedisPool() {