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

Revert "fixed reload but not tested" 

This reverts commit a08ecd93b7.
This commit is contained in:
Govindas 2020-10-24 12:32:40 +03:00
parent 625e7b0d83
commit 266ba28a1d
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/limework/core/RediSkript.java
View File

@ -10,12 +10,16 @@ public class RediSkript extends JavaPlugin {
//Redis manager
private RedisManager rm;
public void startRedis(boolean reload) {
if (reload) { reloadConfig(); }
rm = new RedisManager(this);
rm.start();
}
@Override
public void onEnable() {
saveDefaultConfig();
if (getServer().getPluginManager().getPlugin("Skript") != null) {
rm = new RedisManager(this);
rm.start();
startRedis(false);
PluginCommand command = getServer().getPluginCommand("reloadredis");
assert command != null;

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

@ -149,28 +149,8 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
}
public void reload() {
plugin.reloadConfig();
subscribeJedis.close();
Configuration config = this.plugin.getConfig();
JedisPoolConfig JConfig = new JedisPoolConfig();
JConfig.setMaxTotal(config.getInt("Redis.MaxConnections"));
JConfig.setMaxIdle(config.getInt("Redis.MaxConnections"));
JConfig.setMinIdle(1);
JConfig.setBlockWhenExhausted(true);
this.jedisPool = new JedisPool(JConfig,
config.getString("Redis.Host"),
config.getInt("Redis.Port"),
config.getInt("Redis.TimeOut"),
config.getString("Redis.Password"),
config.getBoolean("Redis.useSSL"));
RedisService.shutdownNow();
RedisService = Executors.newFixedThreadPool(config.getInt("Redis.Threads"));
try {
this.subscribeJedis = this.jedisPool.getResource();
} catch (Exception ignored) {
}
this.channels = config.getStringList("Channels");
encryption = new Encryption(config);
this.shutdown();
plugin.startRedis(true);
}
public JedisPool getJedisPool() {