diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 0589d5fa7f..254472a2c8 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -52,6 +52,7 @@ var/datum/controller/failsafe/Failsafe if(Master.processing && Master.iteration) // Check if processing is done yet. if(Master.iteration == master_iteration) + log_debug("DEFCON [defcon]: Master.iteration=[Master.iteration] Master.last_run=[Master.last_run] world.time=[world.time]") switch(defcon) if(4,5) --defcon @@ -71,7 +72,7 @@ var/datum/controller/failsafe/Failsafe master_iteration = 0 to_chat(admins, "MC restarted successfully") else if(rtn < 0) - log_game("FailSafe: Could not restart MC, runtime encountered. Entering defcon 0") + log_world("FailSafe: Could not restart MC, runtime encountered. Entering defcon 0") to_chat(admins, "ERROR: DEFCON [defcon_pretty()]. Could not restart MC, runtime encountered. I will silently keep retrying.") //if the return number was 0, it just means the mc was restarted too recently, and it just needs some time before we try again //no need to handle that specially when defcon 0 can handle it diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 644ab8d2f0..07cf071246 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -221,10 +221,12 @@ GLOBAL_REAL(Master, /datum/controller/master) = new //loop ended, restart the mc log_game("MC crashed or runtimed, restarting") message_admins("MC crashed or runtimed, restarting") + log_world("MC crashed or runtimed, restarting") var/rtn2 = Recreate_MC() if (rtn2 <= 0) log_game("Failed to recreate MC (Error code: [rtn2]), it's up to the failsafe now") message_admins("Failed to recreate MC (Error code: [rtn2]), it's up to the failsafe now") + log_world("Failed to recreate MC (Error code: [rtn2]), it's up to the failsafe now") Failsafe.defcon = 2 // Main loop. @@ -336,6 +338,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new subsystems_to_check = tickersubsystems if (CheckQueue(subsystems_to_check) <= 0) + log_world("MC: CheckQueue(subsystems_to_check) exited uncleanly, SoftReset (error_level=[error_level]") if (!SoftReset(tickersubsystems, runlevel_sorted_subsystems)) log_world("MC: SoftReset() failed, crashing") return @@ -348,6 +351,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new if (queue_head) if (RunQueue() <= 0) + log_world("MC: RunQueue() exited uncleanly, running SoftReset (error_level=[error_level]") if (!SoftReset(tickersubsystems, runlevel_sorted_subsystems)) log_world("MC: SoftReset() failed, crashing") return