JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduced process wait time per server kill/create

Browse Source 
Added kill bypass for first startup (network reset)

Fixed some log messages that weren't being logged.
This commit is contained in:
Jonathan Williams 2015-03-02 13:42:34 -08:00
parent 3e27675d96
commit 8ddce7cb32
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
View File

@ -360,7 +360,7 @@ public class ServerMonitor
if (deadServer.getUptime() <= 10)
continue;
if (deadServers.contains(deadServer.getName()))
if (_count == 0 || deadServers.contains(deadServer.getName()))
{
killServer(deadServer.getName(), deadServer.getPublicAddress(), deadServer.getPlayerCount(), "[KILLED] [DEAD] " + deadServer.getName() + ":" + deadServer.getPublicAddress(), true);
@ -476,12 +476,12 @@ public class ServerMonitor
if (bestServer == null)
{
System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!! NO DEDICATED SERVER AVAILABLE FOR GROUP " + serverGroup.getName() + " !!!!!!!!!!!!!!!!!!!!!!!!!!!!");
log("!!!!!!!!!!!!!!!!!!!!!!!!!!!! NO DEDICATED SERVER AVAILABLE FOR GROUP " + serverGroup.getName() + " !!!!!!!!!!!!!!!!!!!!!!!!!!!!");
break;
}
if (serverTracker.containsKey(serverGroup.getPrefix() + "-" + serverNum))
System.out.println("[WAITING] On " + serverGroup.getPrefix() + "-" + serverNum + " to finish starting...");
log("[WAITING] On " + serverGroup.getPrefix() + "-" + serverNum + " to finish starting...");
else
{
startServer(bestServer, serverGroup, serverNum, free);
@ -540,7 +540,7 @@ public class ServerMonitor
try
{
pr.join(500);
pr.join(50);
}
catch (InterruptedException e1)
{
@ -640,7 +640,7 @@ public class ServerMonitor
try
{
pr.join(500);
pr.join(100);
}
catch (InterruptedException e1)
{