Name SubServers threads

This change does not apply to SubServers.Client because those apps use the platform's native scheduler instead of threads
ME1312 · Jan 6, 2019 · 94a95de · 94a95de
1 parent 4792e5f
commit 94a95de
Show file tree

Hide file tree

Showing 22 changed files with 36 additions and 29 deletions.
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java
@@ -138,7 +138,7 @@ private void stopped(Boolean allowrestart) {
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
-                }).start();
+                }, "SubServers.Bungee::External_Server_Restart_Handler(" + getName() + ')').start();
             }
         }
     }

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java
@@ -183,7 +183,7 @@ public boolean deleteSubServer(UUID player, String name) throws InterruptedExcep
                     e.printStackTrace();
                 }
                 System.out.println("SubServers > Deleted SubServer: " + server);
-            }).start();
+            }, "SubServers.Bungee::Internal_Server_Deletion(" + name + ')').start();
             return true;
         } else return false;
     }
@@ -228,7 +228,7 @@ public boolean forceDeleteSubServer(UUID player, String name) throws Interrupted
                     e.printStackTrace();
                 }
                 System.out.println("SubServers > Deleted SubServer: " + server);
-            }).start();
+            }, "SubServers.Bungee::Internal_Server_Deletion(" + name + ')').start();
             return true;
         } else return false;
     }

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java
@@ -49,6 +49,7 @@ private class CreatorTask extends Thread {
         private Process process;
 
         private CreatorTask(UUID player, String name, ServerTemplate template, Version version, int port, Callback<SubServer> callback) {
+            super("SubServers.Bungee::Internal_SubCreator_Process_Handler(" + name + ')');
             this.player = player;
             this.name = name;
             this.template = template;

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java
@@ -61,8 +61,8 @@ public void start() {
                 e.printStackTrace();
             }
         }
-        if (out == null) (out = new Thread(() -> start(process.getInputStream(), false))).start();
-        if (err == null) (err = new Thread(() -> start(process.getErrorStream(), true))).start();
+        if (out == null) (out = new Thread(() -> start(process.getInputStream(), false), "SubServers.Bungee::Internal_Log_Spooler(" + name + ')')).start();
+        if (err == null) (err = new Thread(() -> start(process.getErrorStream(), true), "SubServers.Bungee::Internal_Error_Spooler(" + name + ')')).start();
         List<SubLogFilter> filters = new ArrayList<SubLogFilter>();
         filters.addAll(this.filters);
         for (SubLogFilter filter : filters) try {

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java
@@ -172,7 +172,7 @@ private void run() {
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
-                }).start();
+                }, "SubServers.Bungee::Internal_Server_Restart_Handler(" + getName() + ')').start();
             }
         }
     }
@@ -185,7 +185,7 @@ public boolean start(UUID player) {
             host.plugin.getPluginManager().callEvent(event);
             lock = false;
             if (!event.isCancelled()) {
-                (thread = new Thread(this::run)).start();
+                (thread = new Thread(this::run, "SubServers.Bungee::Internal_Server_Process_Handler(" + getName() + ')')).start();
                 return true;
             } else return false;
         } else return false;

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Metrics.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Metrics.java
@@ -150,7 +150,7 @@ public Integer call() throws Exception {
     }
 
     private void startSubmitting() {
-        new Timer().schedule( new TimerTask() {
+        new Timer("SubServers.Bungee::Metrics_Uploader").schedule( new TimerTask() {
             @Override
             public void run() {
                 // The data collection is async, as well as sending the data

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Client.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Client.java
@@ -43,7 +43,7 @@ public Client(SubDataServer subdata, Socket client) throws IOException {
         socket = client;
         out = MessagePack.newDefaultPacker(client.getOutputStream());
         address = new InetSocketAddress(client.getInetAddress(), client.getPort());
-        authorized = new Timer();
+        authorized = new Timer("SubServers.Bungee::SubData_Authorization_Timeout(" + address.toString() + ')');
         authorized.schedule(new TimerTask() {
             @Override
             public void run() {
@@ -81,7 +81,7 @@ private void loop() {
                     e1.printStackTrace();
                 }
             }
-        }).start();
+        }, "SubServers.Bungee::SubData_Packet_Listener(" + address.toString() + ')').start();
     }
 
     private void recievePacket(Value input) {

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCreateServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCreateServer.java
@@ -82,7 +82,7 @@ public void execute(Client client, YAMLSection data) {
                             } catch (InterruptedException e) {
                                 e.printStackTrace();
                             }
-                        }).start();
+                        }, "SubServers.Bungee::SubData_SubCreator_Handler(" + client.getAddress().toString() + ')').start();
                     } else {
                         client.sendPacket(new PacketCreateServer(0, "Creating SubServer", (data.contains("id")) ? data.getRawString("id") : null));
                     }

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
@@ -115,7 +115,7 @@ public void execute(CommandSender sender, String[] args) {
                                 sender.sendMessage("SubServers.Bungee v" + updversion + " is available. You are " + updcount + " version" + ((updcount == 1)?"":"s") + " behind.");
                             }
                         } catch (Exception e) {}
-                    }).start();
+                    }, "SubServers.Bungee::Update_Check").start();
                 } else if (args[0].equalsIgnoreCase("reload")) {
                     if (args.length > 1) {
                         switch (args[1].toLowerCase()) {

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java
@@ -396,7 +396,7 @@ public void reload() throws IOException {
                     e.printStackTrace();
                 }
             }
-        }));
+        }, "SubServers.Bungee::System_Shutdown"));
         running = true;
         List<String> autorun = new LinkedList<String>();
         for (String name : config.get().getSection("Servers").getKeys()) {
@@ -544,7 +544,7 @@ private void post() {
         getPluginManager().registerCommand(null, SubCommand.newInstance(this, "sub").get());
 
         new Metrics(this);
-        new Timer().schedule(new TimerTask() {
+        new Timer("SubServers.Bungee::Routine_Update_Check").schedule(new TimerTask() {
             @SuppressWarnings("unchecked")
             @Override
             public void run() {
@@ -577,7 +577,7 @@ private void loop() {
                     if (!(e instanceof SocketException)) e.printStackTrace();
                 }
             }
-        }).start();
+        }, "SubServers.Bungee::SubData_Connection_Listener").start();
     }
 
     /**

diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiEngine</artifactId>
-            <version>19w01a</version>
+            <version>19w02c</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
@@ -4,6 +4,7 @@
 import net.ME1312.Galaxi.Engine.GalaxiEngine;
 import net.ME1312.Galaxi.Engine.GalaxiOption;
 import net.ME1312.Galaxi.Event.GalaxiReloadEvent;
+import net.ME1312.Galaxi.Galaxi;
 import net.ME1312.Galaxi.Library.Config.YAMLConfig;
 import net.ME1312.Galaxi.Library.Config.YAMLSection;
 import net.ME1312.Galaxi.Library.Log.Logger;
@@ -213,7 +214,7 @@ private ExHost(joptsimple.OptionSet options) {
                     log.warn.println("Received request from system to shutdown");
                     engine.stop();
                 }
-            }));
+            }, SubAPI.getInstance().getAppInfo().getName() + "::System_Shutdown"));
             creator = new SubCreator(this);
 
             loadDefaults();

diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java
@@ -14,6 +14,7 @@
 import net.ME1312.SubServers.Host.Network.Packet.PacketExCreateServer;
 import net.ME1312.SubServers.Host.Network.Packet.PacketOutExLogMessage;
 import net.ME1312.SubServers.Host.ExHost;
+import net.ME1312.SubServers.Host.SubAPI;
 import org.json.JSONObject;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -190,6 +191,7 @@ private class CreatorTask extends Thread {
         private Process process;
 
         private CreatorTask(String name, ServerTemplate template, Version version, int port, UUID address, String id) {
+            super(SubAPI.getInstance().getAppInfo().getName() + "::SubCreator_Process_Handler(" + name + ')');
             this.name = name;
             this.template = template;
             this.version = version;

diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLogger.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLogger.java
@@ -63,8 +63,8 @@ public void start() {
                 logger.error.println(e);
             }
         }
-        if (out == null) (out = new Thread(() -> start(process.getInputStream(), false))).start();
-        if (err == null) (err = new Thread(() -> start(process.getErrorStream(), true))).start();
+        if (out == null) (out = new Thread(() -> start(process.getInputStream(), false), SubAPI.getInstance().getAppInfo().getName() + "::Log_Spooler(" + name + ')')).start();
+        if (err == null) (err = new Thread(() -> start(process.getErrorStream(), true), SubAPI.getInstance().getAppInfo().getName() + "::Error_Spooler(" + name + ')')).start();
     }
 
 

diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServer.java
@@ -7,6 +7,7 @@
 import net.ME1312.SubServers.Host.Library.Exception.InvalidServerException;
 import net.ME1312.SubServers.Host.Network.Packet.PacketExUpdateServer;
 import net.ME1312.SubServers.Host.ExHost;
+import net.ME1312.SubServers.Host.SubAPI;
 
 import java.io.*;
 import java.util.LinkedList;
@@ -141,7 +142,7 @@ private void run() {
     public void start(UUID address) {
         if (isEnabled() && !(thread != null && thread.isAlive())) {
             logger.address = address;
-            (thread = new Thread(this::run)).start();
+            (thread = new Thread(this::run, SubAPI.getInstance().getAppInfo().getName() + "::Server_Process_Handler(" + name + ')')).start();
         }
     }
 

diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java
@@ -5,6 +5,7 @@
 import net.ME1312.Galaxi.Library.Config.YAMLSection;
 import net.ME1312.Galaxi.Library.Log.Logger;
 import net.ME1312.SubServers.Host.ExHost;
+import net.ME1312.SubServers.Host.SubAPI;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -144,7 +145,7 @@ public Metrics(ExHost host) {
      * Starts the Scheduler which submits our data every 30 minutes.
      */
     private void startSubmitting() {
-        final Timer timer = new Timer(true);
+        final Timer timer = new Timer(SubAPI.getInstance().getAppInfo().getName() + "::Metrics_Uploader", true);
         timer.scheduleAtFixedRate(new TimerTask() {
             @Override
             public void run() {

diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDeleteServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDeleteServer.java
@@ -12,6 +12,7 @@
 import net.ME1312.SubServers.Host.Network.PacketOut;
 import net.ME1312.SubServers.Host.Network.SubDataClient;
 import net.ME1312.SubServers.Host.ExHost;
+import net.ME1312.SubServers.Host.SubAPI;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -106,7 +107,7 @@ public void execute(YAMLSection data) {
                     if (UPnP.isUPnPAvailable() && UPnP.isMappedTCP(server.getPort())) UPnP.closePortTCP(server.getPort());
                     log.info.println("Deleted SubServer: " + data.getRawString("server"));
                     host.subdata.sendPacket(new PacketExDeleteServer(0, "Server Deleted Successfully", (data.contains("id"))?data.getRawString("id"):null));
-                }).start();
+                }, SubAPI.getInstance().getAppInfo().getName() + "::Server_Deletion(" + server.getName() + ')').start();
             }
         } catch (Throwable e) {
             host.subdata.sendPacket(new PacketExDeleteServer(1, e.getClass().getCanonicalName() + ": " + e.getMessage(), (data.contains("id"))?data.getRawString("id"):null));

diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubDataClient.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubDataClient.java
@@ -177,7 +177,7 @@ private void loop() {
                     log.error.println(e1);
                 }
             }
-        }).start();
+        }, SubAPI.getInstance().getAppInfo().getName() + "::SubData_Packet_Listener").start();
     }
 
     private void recieve(Value input) {
@@ -550,7 +550,7 @@ public void destroy(int reconnect) throws IOException {
             log.info.println("The SubData Connection was closed");
             if (reconnect > 0) {
                 log.info.println("Attempting to reconnect in " + reconnect + " seconds");
-                Timer timer = new Timer();
+                Timer timer = new Timer(SubAPI.getInstance().getAppInfo().getName() + "::SubData_Reconnect_Handler");
                 timer.scheduleAtFixedRate(new TimerTask() {
                     @Override
                     public void run() {

diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Metrics.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Metrics.java
@@ -130,7 +130,7 @@ public JsonObject getPluginData() {
     }
 
     private void startSubmitting() {
-        new Timer().schedule( new TimerTask() {
+        new Timer("SubServers.Sync::Metrics_Uploader").schedule( new TimerTask() {
             @Override
             public void run() {
                 // The data collection is async, as well as sending the data

diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubDataClient.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubDataClient.java
@@ -189,7 +189,7 @@ private void loop() {
                     e1.printStackTrace();
                 }
             }
-        }).start();
+        }, "SubServers.Sync::SubData_Packet_Listener").start();
     }
 
     private void recieve(Value input) {
@@ -470,7 +470,7 @@ public void destroy(int reconnect) throws IOException {
             System.out.println("SubServers > The SubData Connection was closed");
             if (reconnect > 0) {
                 System.out.println("SubServers > Attempting to reconnect in " + reconnect + " seconds");
-                Timer timer = new Timer();
+                Timer timer = new Timer("SubServers.Sync::SubData_Reconnect_Handler");
                 timer.scheduleAtFixedRate(new TimerTask() {
                     @Override
                     public void run() {

diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java
@@ -114,7 +114,7 @@ public void execute(CommandSender sender, String[] args) {
                             }
                         } catch (Exception e) {
                         }
-                    }).start();
+                    }, "SubServers.Sync::Update_Check").start();
                 } else if (args[0].equalsIgnoreCase("list")) {
                     plugin.api.getGroups(groups -> plugin.api.getHosts(hosts -> plugin.api.getServers(servers -> plugin.api.getMasterProxy(proxymaster -> plugin.api.getProxies(proxies -> {
                         int i = 0;

diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java
@@ -132,7 +132,7 @@ private void post() {
         getPluginManager().registerCommand(null, SubCommand.newInstance(this, "sub").get());
 
         new Metrics(this);
-        new Timer().schedule(new TimerTask() {
+        new Timer("SubServers.Sync::Routine_Update_Check").schedule(new TimerTask() {
             @SuppressWarnings("unchecked")
             @Override
             public void run() {