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

Merge pull request #6 from md-5/master

Browse Source 
Make use of Bungee scheduler for threaded operations.
This commit is contained in:
minecrafter 2014-07-02 02:43:06 -04:00
commit a9fb0cd88a
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,6 @@ package com.imaginarycode.minecraft.redisbungee;
import com.google.common.base.Functions; import com.google.common.base.Functions;
import com.google.common.collect.*; import com.google.common.collect.*;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent; import com.imaginarycode.minecraft.redisbungee.events.PubSubMessageEvent;
import com.imaginarycode.minecraft.redisbungee.util.UUIDTranslator; import com.imaginarycode.minecraft.redisbungee.util.UUIDTranslator;
@ -29,8 +28,6 @@ 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.ExecutorService;
import java.util.concurrent.Executors;
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;
@ -351,7 +348,7 @@ public final class RedisBungee extends Plugin {
} }
}, 0, 3, TimeUnit.SECONDS); }, 0, 3, TimeUnit.SECONDS);
consumer = new RedisBungeeConsumer(this); consumer = new RedisBungeeConsumer(this);
new Thread(consumer, "RedisBungee Consumer Thread").start(); getProxy().getScheduler().runAsync(this, consumer);
if (configuration.getBoolean("register-bungee-commands", true)) { if (configuration.getBoolean("register-bungee-commands", true)) {
getProxy().getPluginManager().registerCommand(this, new RedisBungeeCommands.GlistCommand(this)); getProxy().getPluginManager().registerCommand(this, new RedisBungeeCommands.GlistCommand(this));
getProxy().getPluginManager().registerCommand(this, new RedisBungeeCommands.FindCommand(this)); getProxy().getPluginManager().registerCommand(this, new RedisBungeeCommands.FindCommand(this));
@ -527,12 +524,11 @@ public final class RedisBungee extends Plugin {
} }
class JedisPubSubHandler extends JedisPubSub { class JedisPubSubHandler extends JedisPubSub {
private final ExecutorService executor = Executors.newCachedThreadPool(new ThreadFactoryBuilder().setDaemon(true).setNameFormat("RedisBungee PubSub Handler - #%d").build());
@Override @Override
public void onMessage(final String s, final String s2) { public void onMessage(final String s, final String s2) {
if (s2.trim().length() == 0) return; if (s2.trim().length() == 0) return;
executor.submit(new Runnable() { getProxy().getScheduler().runAsync(RedisBungee.this, new Runnable() {
@Override @Override
public void run() { public void run() {
getProxy().getPluginManager().callEvent(new PubSubMessageEvent(s, s2)); getProxy().getPluginManager().callEvent(new PubSubMessageEvent(s, s2));

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

@ -46,7 +46,7 @@ class UUIDFetcher implements Callable<Map<String, UUID>> {
uuidMap.put(profile.name, uuid); uuidMap.put(profile.name, uuid);
} }
if (rateLimiting && i != requests - 1) { if (rateLimiting && i != requests - 1) {
Thread.sleep(100L); Thread.sleep(100L); // FIXME: This is not how we into concurrency
} }
} }
return uuidMap; return uuidMap;