Limework/RedisBungee
2
0
Fork 0
mirror of https://github.com/proxiodev/RedisBungee.git synced 2024-11-23 04:28:01 +00:00
Code Releases Activity

Port RedisBungee to threadGroup branch of BungeeCord

Browse Source
This commit is contained in:
Tux 2014-07-09 22:54:12 -04:00
parent 1769463df1
commit 7a710c1ae0
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungee.java
View File

@ -28,6 +28,9 @@ import java.io.*;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.*; import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level; import java.util.logging.Level;
@ -440,8 +443,8 @@ public final class RedisBungee extends Plugin {
configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(file); configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(file);
String redisServer = configuration.getString("redis-server", "localhost"); final String redisServer = configuration.getString("redis-server", "localhost");
int redisPort = configuration.getInt("redis-port", 6379); final int redisPort = configuration.getInt("redis-port", 6379);
String redisPassword = configuration.getString("redis-password"); String redisPassword = configuration.getString("redis-password");
serverId = configuration.getString("server-id"); serverId = configuration.getString("server-id");
@ -455,9 +458,25 @@ public final class RedisBungee extends Plugin {
} }
if (redisServer != null && !redisServer.isEmpty()) { if (redisServer != null && !redisServer.isEmpty()) {
JedisPoolConfig config = new JedisPoolConfig(); final String finalRedisPassword = redisPassword;
config.setMaxTotal(configuration.getInt("max-redis-connections", -1)); FutureTask<JedisPool> task = new FutureTask<>(new Callable<JedisPool>() {
pool = new JedisPool(config, redisServer, redisPort, 0, redisPassword); @Override
public JedisPool call() throws Exception {
JedisPoolConfig config = new JedisPoolConfig();
config.setMaxTotal(configuration.getInt("max-redis-connections", -1));
config.setJmxEnabled(false);
return new JedisPool(config, redisServer, redisPort, 0, finalRedisPassword);
}
});
getProxy().getScheduler().runAsync(this, task);
try {
pool = task.get();
} catch (InterruptedException | ExecutionException e) {
throw new RuntimeException("Unable to create Redis pool", e);
}
// Test the connection // Test the connection
Jedis rsc = null; Jedis rsc = null;
try { try {