🐎 Improved performance

Author: CustomEntity

build.gradle

@@ -3,7 +3,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 apply plugin: 'java'
 
 group = 'fr.customentity'
-version = '0.3.1'
+version = '0.3.2'
 
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'

src/main/java/fr/customentity/advancedbungeequeue/bungee/manager/QueueManager.java

@@ -4,14 +4,18 @@
 import fr.customentity.advancedbungeequeue.bungee.data.Priority;
 import fr.customentity.advancedbungeequeue.bungee.data.QueuedPlayer;
 import fr.customentity.advancedbungeequeue.bungee.runnable.ConnectRunnable;
-import fr.customentity.advancedbungeequeue.common.QueueResult;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ServerConnectEvent;
 
-import java.net.InetSocketAddress;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
 public class QueueManager {
@@ -20,24 +24,22 @@ public class QueueManager {
 
     private ConcurrentHashMap<ServerInfo, List<QueuedPlayer>> queue;
     private ScheduledExecutorService scheduledExecutorService;
-    private List<ScheduledFuture<?>> scheduledFutures;
 
     private boolean paused = false;
     private boolean enabled = true;
 
     public QueueManager(AdvancedBungeeQueue plugin) {
         this.plugin = plugin;
         this.queue = new ConcurrentHashMap<>();
-        this.scheduledExecutorService = new ScheduledThreadPoolExecutor(plugin.getConfigFile().getInt("thread-pool-size"));
-        this.scheduledFutures = new ArrayList<>();
 
         this.startQueue();
     }
 
     public void startQueue() {
         this.loadServersQueue();
+        this.scheduledExecutorService = Executors.newScheduledThreadPool(queue.keySet().size());
         for (ServerInfo serverInfo : queue.keySet()) {
-            this.scheduledFutures.add(this.scheduledExecutorService.scheduleAtFixedRate(new ConnectRunnable(plugin, serverInfo), this.plugin.getConfigFile().getLong("queue-speed"), this.plugin.getConfigFile().getLong("queue-speed"), TimeUnit.MILLISECONDS));
+            this.scheduledExecutorService.scheduleAtFixedRate(new ConnectRunnable(plugin, serverInfo), this.plugin.getConfigFile().getLong("queue-speed"), this.plugin.getConfigFile().getLong("queue-speed"), TimeUnit.MILLISECONDS);
         }
     }
 
@@ -50,10 +52,18 @@ public boolean isEnabled() {
     }
 
     public void setEnabled(boolean enabled) {
-        if (!enabled) {
+        if (this.enabled && !enabled) {
             queue.clear();
-            this.scheduledFutures.forEach(scheduledFuture -> scheduledFuture.cancel(true));
-        } else {
+            Thread thread = new Thread(() -> {
+                this.scheduledExecutorService.shutdown();
+                try {
+                    this.scheduledExecutorService.awaitTermination(5, TimeUnit.SECONDS);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            });
+            thread.start();
+        } else if (!this.enabled && enabled) {
             this.startQueue();
         }
         this.enabled = enabled;

src/main/java/fr/customentity/advancedbungeequeue/bungee/socket/ServerThread.java

@@ -16,7 +16,7 @@
 import java.util.Optional;
 import java.util.UUID;
 
-public class ServerThread extends Thread {
+public class ServerThread implements Runnable {
 
     private AdvancedBungeeQueue plugin;
     private Socket client;
@@ -62,8 +62,6 @@ public void run() {
             in.close();
             reader.close();
             client.close();
-
-            this.interrupt();
         } catch (IOException | ClassNotFoundException e) {
             e.printStackTrace();
         }

src/main/java/fr/customentity/advancedbungeequeue/bungee/socket/SocketManager.java

@@ -6,15 +6,21 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.logging.Level;
 
 public class SocketManager {
 
     ServerSocket socket;
     private AdvancedBungeeQueue plugin;
 
+    private ExecutorService cachedExecutorService;
+
     public SocketManager(AdvancedBungeeQueue plugin) {
         this.plugin = plugin;
+
+        this.cachedExecutorService = Executors.newCachedThreadPool();
     }
 
     public void initListener() {
@@ -29,8 +35,7 @@ public void initListener() {
                         Socket client = socket.accept();
                         client.setKeepAlive(true);
 
-                        ServerThread serverThread = new ServerThread(plugin, client);
-                        serverThread.start();
+                        this.cachedExecutorService.submit(new ServerThread(plugin, client));
                     }
 
                 } catch (IOException e) {

src/main/java/fr/customentity/advancedbungeequeue/common/actions/all/ConfirmConnectionAction.java

@@ -3,7 +3,6 @@
 import fr.customentity.advancedbungeequeue.common.QueueResult;
 import fr.customentity.advancedbungeequeue.common.actions.PlayerAction;
 
-import java.io.Serializable;
 import java.util.UUID;
 
 public class ConfirmConnectionAction extends PlayerAction {
@@ -18,4 +17,4 @@ public ConfirmConnectionAction(UUID uuid, QueueResult queueResult) {
     public QueueResult getQueueResult() {
         return queueResult;
     }
-}
+}

src/main/java/fr/customentity/advancedbungeequeue/spigot/SocketManager.java

@@ -48,7 +48,7 @@ public void sendCommandToExecute(UUID uuid, String command) {
         Thread thread = new Thread(() -> {
             Socket client;
             try {
-                client = new Socket("localhost", plugin.getConfig().getInt("socket-port"));
+                client = new Socket(plugin.getConfig().getString("socket-host", "localhost"), plugin.getConfig().getInt("socket-port"));
                 OutputStream out = client.getOutputStream();
                 ObjectOutputStream writer = new ObjectOutputStream(out);
                 writer.writeUTF(plugin.getConfig().getString("socket-password", "TOABSOLUTELYCHANGE"));

src/main/resources/config.yml

@@ -6,7 +6,6 @@ player-amount: 2
 socket-host: localhost
 socket-port: 1233
 socket-password: "TOABSOLUTELYCHANGE"
-thread-pool-size: 4
 use-same-queue: false
 default-servers:
   - "lobby"