projectswg-bitbucket/cucore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/cucore.git synced 2026-10-16 08:13:21 -04:00
Code Issues Projects Releases Wiki Activity

Refactored sendShutdownBroadcasts() to be more dynamic and less error-prone

Browse Source
This commit is contained in:
Ziggy
2015-05-14 16:38:27 +02:00
parent 8129c4bdb2
commit 796290220e
5 changed files with 100 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/CoreManager.java
+16 -12
View File
@@ -129,24 +129,28 @@ public class CoreManager extends Manager {
private void handleServerManagementIntent(ServerManagementIntent i) {
switch(i.getEvent()) {
case SHUTDOWN: initiateShutdownSequence(i.getTime()); break;
case SHUTDOWN: initiateShutdownSequence(i); break;
default: break;
}
}
private void initiateShutdownSequence(long time) {
private void initiateShutdownSequence(ServerManagementIntent i) {
System.out.println("Beginning server shutdown sequence...");
long time = i.getTime();
TimeUnit timeUnit = i.getTimeUnit();
if (time > 0) {
Executors.newSingleThreadScheduledExecutor().schedule(new Runnable() {
public void run() {
shutdownRequested = true;
}
}, time, TimeUnit.MINUTES);
} else {
shutdownRequested = true;
}
new ServerStatusIntent(ServerStatus.SHUTDOWN_REQUESTED, time).broadcast();
Executors.newSingleThreadScheduledExecutor().schedule(
new Runnable() {
@Override
public void run() {
shutdownRequested = true;
}
// Ziggy: Give the broadcast method extra time to complete.
// If we don't, the final broadcast won't be displayed.
},
TimeUnit.NANOSECONDS.convert(time, timeUnit) + TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS), TimeUnit.NANOSECONDS);
new ServerStatusIntent(ServerStatus.SHUTDOWN_REQUESTED, time, i.getTimeUnit()).broadcast();
}
public GalaxyStatus getGalaxyStatus() {