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

Clean up code, automatic crash detection, fix some bugs

Browse Source
This commit is contained in:
Tux 2014-05-22 23:37:26 -04:00
parent 638643dab7
commit 61b83e5889
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,10 +6,8 @@
*/ */
package com.imaginarycode.minecraft.redisbungee; package com.imaginarycode.minecraft.redisbungee;
import com.google.common.collect.ImmutableList; import com.google.common.base.Functions;
import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.*;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Multimap;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.gson.Gson; import com.google.gson.Gson;
@ -160,11 +158,8 @@ public final class RedisBungee extends Plugin {
return setBuilder.build(); return setBuilder.build();
} }
final Set<String> getLocalPlayersAsUuidStrings() { final Collection<String> getLocalPlayersAsUuidStrings() {
ImmutableSet.Builder<String> setBuilder = ImmutableSet.builder(); return Collections2.transform(getLocalPlayers(), Functions.toStringFunction());
for (ProxiedPlayer pp : getProxy().getPlayers())
setBuilder = setBuilder.add(pp.getUniqueId().toString());
return setBuilder.build();
} }
final Set<UUID> getPlayers() { final Set<UUID> getPlayers() {
@ -183,8 +178,9 @@ public final class RedisBungee extends Plugin {
Set<String> users = rsc.sunion(keys.toArray(new String[keys.size()])); Set<String> users = rsc.sunion(keys.toArray(new String[keys.size()]));
if (users != null && !users.isEmpty()) { if (users != null && !users.isEmpty()) {
for (String user : users) { for (String user : users) {
if (UUIDTranslator.UUID_PATTERN.matcher(user).find()) { try {
setBuilder = setBuilder.add(UUID.fromString(user)); setBuilder = setBuilder.add(UUID.fromString(user));
} catch (IllegalArgumentException ignored) {
} }
} }
} }
@ -361,7 +357,7 @@ public final class RedisBungee extends Plugin {
public void run() { public void run() {
Jedis tmpRsc = pool.getResource(); Jedis tmpRsc = pool.getResource();
try { try {
Set<String> players = getLocalPlayersAsUuidStrings(); Collection<String> players = getLocalPlayersAsUuidStrings();
for (String member : tmpRsc.smembers("server:" + serverId + ":usersOnline")) for (String member : tmpRsc.smembers("server:" + serverId + ":usersOnline"))
if (!players.contains(member)) { if (!players.contains(member)) {
// Are they simply on a different proxy? // Are they simply on a different proxy?
@ -400,7 +396,7 @@ public final class RedisBungee extends Plugin {
consumer.stop(); consumer.stop();
Jedis tmpRsc = pool.getResource(); Jedis tmpRsc = pool.getResource();
try { try {
tmpRsc.hdel("playerCounts", serverId, "0"); tmpRsc.hdel("playerCounts", serverId);
if (tmpRsc.scard("server:" + serverId + ":usersOnline") > 0) { if (tmpRsc.scard("server:" + serverId + ":usersOnline") > 0) {
for (String member : tmpRsc.smembers("server:" + serverId + ":usersOnline")) for (String member : tmpRsc.smembers("server:" + serverId + ":usersOnline"))
RedisUtil.cleanUpPlayer(member, tmpRsc); RedisUtil.cleanUpPlayer(member, tmpRsc);
@ -459,11 +455,17 @@ public final class RedisBungee extends Plugin {
if (crashFile.exists()) if (crashFile.exists())
crashFile.delete(); crashFile.delete();
else if (rsc.hexists("heartbeats", serverId)) { else if (rsc.hexists("heartbeats", serverId)) {
try {
Long value = Long.valueOf(rsc.hget("heartbeats", serverId));
if (value != null && System.currentTimeMillis() < value + 20000) {
getLogger().severe("You have launched a possible imposter BungeeCord instance. Another instance is already running."); getLogger().severe("You have launched a possible imposter BungeeCord instance. Another instance is already running.");
getLogger().severe("For data consistency reasons, RedisBungee will now disable itself."); getLogger().severe("For data consistency reasons, RedisBungee will now disable itself.");
getLogger().severe("If this instance is coming up from a crash, create a file in your RedisBungee plugins directory with the name 'restarted_from_crash.txt' and RedisBungee will not perform this check."); getLogger().severe("If this instance is coming up from a crash, create a file in your RedisBungee plugins directory with the name 'restarted_from_crash.txt' and RedisBungee will not perform this check.");
throw new RuntimeException("Possible imposter instance!"); throw new RuntimeException("Possible imposter instance!");
} }
} catch (NumberFormatException ignored) {
}
}
getLogger().log(Level.INFO, "Successfully connected to Redis."); getLogger().log(Level.INFO, "Successfully connected to Redis.");
} catch (JedisConnectionException e) { } catch (JedisConnectionException e) {
if (rsc != null) if (rsc != null)

2
src/main/java/com/imaginarycode/minecraft/redisbungee/RedisBungeeAPI.java
View File

@ -64,7 +64,7 @@ public class RedisBungeeAPI {
/** /**
* Get a combined list of players on this network. * Get a combined list of players on this network.
* <p/> * <p>
* <strong>Note that this function returns an immutable {@link java.util.Set}.</strong> * <strong>Note that this function returns an immutable {@link java.util.Set}.</strong>
* *
* @return a Set with all players found * @return a Set with all players found