From 42dec900da2ea05729070a8abbd0b043a9155fd2 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Mon, 29 Jun 2020 03:23:34 -0400 Subject: [PATCH] Fixes Wrong Garbage Controller Timeouts (#51890) Noticed this tonight. There was once 3 collection timeouts when there was the pre-queue; now there's only 2, but there's still 3 timeout levels. The unintended impacts of this are...well, a LOT of false positives. Needless to say, unless something garbage collected INSTANTANEOUSLY, it would be marked as a failure. Likewise, it meant queued hard deletes had to wait a full 2 minutes before they were actually hard deleted instead of just 10 seconds (Oh dear, who knows what problems that's been causing!) This should all be fixed now. Less time wasted on false positive GC failures and more time spent on hunting down actual failures. --- code/controllers/subsystem/garbage.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index f8ca1e7eae4..094fc1217dd 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -6,7 +6,7 @@ SUBSYSTEM_DEF(garbage) runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY init_order = INIT_ORDER_GARBAGE - var/list/collection_timeout = list(0, 2 MINUTES, 10 SECONDS) // deciseconds to wait before moving something up in the queue to the next level + var/list/collection_timeout = list(2 MINUTES, 10 SECONDS) // deciseconds to wait before moving something up in the queue to the next level //Stat tracking var/delslasttick = 0 // number of del()'s we've done this tick