yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slight improvements to server shutdown

Browse Source
This commit is contained in:
ceikry
2021-07-24 14:30:09 -05:00
parent c2e7358522
commit 7557cfb4ca
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/system/SystemTermination.java
+1
View File
@@ -35,6 +35,7 @@ public final class SystemTermination {
public void terminate() { public void terminate() {
SystemLogger.logInfo("[SystemTerminator] Initializing termination sequence - do not shutdown!"); SystemLogger.logInfo("[SystemTerminator] Initializing termination sequence - do not shutdown!");
try { try {
Server.setRunning(false);
for(Player player : Repository.getPlayers()){ for(Player player : Repository.getPlayers()){
DMCHandler dmc = player.getAttribute("dmc",null); DMCHandler dmc = player.getAttribute("dmc",null);
if(dmc != null){ if(dmc != null){
Server/src/main/kotlin/rs09/Server.kt
+2 -2
View File
@@ -35,6 +35,7 @@ object Server {
var lastHeartbeat = System.currentTimeMillis() var lastHeartbeat = System.currentTimeMillis()
@JvmStatic
var running = false var running = false
/** /**
@@ -102,9 +103,8 @@ object Server {
GlobalScope.launch { GlobalScope.launch {
delay(20000) delay(20000)
while(running){ while(running){
if(System.currentTimeMillis() - lastHeartbeat > 1800){ if(System.currentTimeMillis() - lastHeartbeat > 1800 && running){
SystemLogger.logErr("Triggering reboot due to heartbeat timeout") SystemLogger.logErr("Triggering reboot due to heartbeat timeout")
running = false
exitProcess(0) exitProcess(0)
} }
delay(625) delay(625)