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

Add primitive heartbeat system

Browse Source
This commit is contained in:
Tux 2014-04-19 15:52:15 -04:00
parent 2ddd35c438
commit 72eb4c6a67
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@ -73,7 +74,17 @@ public final class RedisBungee extends Plugin implements Listener {
final List<String> getServerIds() { final List<String> getServerIds() {
Jedis jedis = pool.getResource(); Jedis jedis = pool.getResource();
try { try {
return ImmutableList.copyOf(jedis.smembers("servers")); ImmutableList.Builder<String> servers = ImmutableList.builder();
Map<String, String> heartbeats = jedis.hgetAll("heartbeats");
for (Map.Entry<String, String> entry : heartbeats.entrySet()) {
try {
long stamp = Long.valueOf(entry.getValue());
if (stamp + 30000 < System.currentTimeMillis())
servers.add(entry.getKey());
} catch (NumberFormatException ignored) {
}
}
return servers.build();
} catch (JedisConnectionException e) { } catch (JedisConnectionException e) {
getLogger().log(Level.SEVERE, "Unable to fetch all server IDs", e); getLogger().log(Level.SEVERE, "Unable to fetch all server IDs", e);
return Collections.singletonList(configuration.getString("server-id")); return Collections.singletonList(configuration.getString("server-id"));
@ -274,6 +285,7 @@ public final class RedisBungee extends Plugin implements Listener {
Jedis tmpRsc = pool.getResource(); Jedis tmpRsc = pool.getResource();
try { try {
tmpRsc.set("server:" + configuration.getString("server-id") + ":playerCount", "0"); // reset tmpRsc.set("server:" + configuration.getString("server-id") + ":playerCount", "0"); // reset
tmpRsc.hset("heartbeats", configuration.getString("server-id"), String.valueOf(System.currentTimeMillis()));
if (tmpRsc.scard("server:" + configuration.getString("server-id") + ":usersOnline") > 0) { if (tmpRsc.scard("server:" + configuration.getString("server-id") + ":usersOnline") > 0) {
for (String member : tmpRsc.smembers("server:" + configuration.getString("server-id") + ":usersOnline")) { for (String member : tmpRsc.smembers("server:" + configuration.getString("server-id") + ":usersOnline")) {
// Are they simply on a different proxy? // Are they simply on a different proxy?
@ -301,6 +313,7 @@ public final class RedisBungee extends Plugin implements Listener {
Jedis rsc = pool.getResource(); Jedis rsc = pool.getResource();
try { try {
rsc.set("server:" + configuration.getString("server-id") + ":playerCount", String.valueOf(getProxy().getOnlineCount())); rsc.set("server:" + configuration.getString("server-id") + ":playerCount", String.valueOf(getProxy().getOnlineCount()));
rsc.hset("heartbeats", configuration.getString("server-id"), String.valueOf(System.currentTimeMillis()));
} catch (JedisConnectionException e) { } catch (JedisConnectionException e) {
// Redis server has disappeared! // Redis server has disappeared!
getLogger().log(Level.SEVERE, "Unable to update proxy counts - did your Redis server go away?", e); getLogger().log(Level.SEVERE, "Unable to update proxy counts - did your Redis server go away?", e);
@ -451,7 +464,7 @@ public final class RedisBungee extends Plugin implements Listener {
if (pool != null) { if (pool != null) {
Jedis rsc = pool.getResource(); Jedis rsc = pool.getResource();
try { try {
for (String server : rsc.smembers("servers")) { for (String server : getServerIds()) {
if (rsc.sismember("server:" + server + ":usersOnline", event.getConnection().getName())) { if (rsc.sismember("server:" + server + ":usersOnline", event.getConnection().getName())) {
event.setCancelled(true); event.setCancelled(true);
event.setCancelReason("You are already logged on to this server."); event.setCancelReason("You are already logged on to this server.");
@ -539,7 +552,7 @@ public final class RedisBungee extends Plugin implements Listener {
reply.setPlayers(new ServerPing.Players(old.getPlayers().getMax(), getCount(), null)); reply.setPlayers(new ServerPing.Players(old.getPlayers().getMax(), getCount(), null));
} }
reply.setDescription(old.getDescription()); reply.setDescription(old.getDescription());
reply.setFavicon(old.getFavicon()); reply.setFavicon(old.getFaviconObject());
reply.setVersion(old.getVersion()); reply.setVersion(old.getVersion());
event.setResponse(reply); event.setResponse(reply);
} }