cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lots of dumb logging stuff that breaks when config isnt loaded fast enough to catch errors (#12346)

Browse Source
This commit is contained in:
sood
2016-10-26 07:26:05 -07:00
committed by clusterfack
parent d9c649295c
commit e5f3212c25
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__HELPERS/logging.dm
View File

@@ -47,7 +47,7 @@
admin_diary << html_decode(text_to_log)
/proc/log_debug(text)
if (config.log_debug)
if (!config || (config && config.log_debug)) // Sorry, if config isn't loaded we'll assume you want debug output.
diary << html_decode("\[[time_stamp()]]DEBUG: [text]")
for(var/client/C in admins)

25
code/modules/error_handler/error_handler.dm
View File

@@ -30,15 +30,32 @@
// Handle cooldowns and silencing spammy errors
var/silencing = 0
// We can runtime before config is initialized because BYOND initialize objs/map before a bunch of other stuff happens.
// This is a bunch of workaround code for that. Hooray!
var/configured_error_cooldown
var/configured_error_limit
var/configured_error_silence_time
if(config)
configured_error_cooldown = config.error_cooldown
configured_error_limit = config.error_limit
configured_error_silence_time = config.error_silence_time
else
configured_error_cooldown = initial(config.error_cooldown)
configured_error_limit = initial(config.error_limit)
configured_error_silence_time = initial(config.error_silence_time)
// Each occurrence of a unique error adds to its "cooldown" time...
cooldown = max(0, cooldown - (world.time - last_seen)) + config.error_cooldown
cooldown = max(0, cooldown - (world.time - last_seen)) + configured_error_cooldown
// ... which is used to silence an error if it occurs too often, too fast
if (cooldown > config.error_cooldown * config.error_limit)
if (cooldown > configured_error_cooldown * configured_error_limit)
cooldown = -1
silencing = 1
spawn (0)
usr = null
sleep(config.error_silence_time)
sleep(configured_error_silence_time)
var/skipcount = abs(global.error_cooldown[erroruid]) - 1
global.error_cooldown[erroruid] = 0
if (skipcount > 0)
@@ -81,7 +98,7 @@
desclines.Add(usrinfo)
if (silencing)
desclines += " (This error will now be silenced for [config.error_silence_time / 600] minutes)"
desclines += " (This error will now be silenced for [configured_error_silence_time / 600] minutes)"
// Now to actually output the error info...
world.log << "\[[time_stamp()]] Runtime in [e.file],[e.line]: [e]"

7
code/modules/error_handler/error_viewer.dm
View File

@@ -117,7 +117,12 @@
if (error_source.next_message_at <= world.time)
var/const/viewtext = "\[view]" // Nesting these in other brackets went poorly
log_debug("Runtime in <b>[e.file]</b>, line <b>[e.line]</b>: <b>[html_encode(e.name)]</b> [error_entry.make_link(viewtext)]")
error_source.next_message_at = world.time + config.error_msg_delay
var/err_msg_delay
if(config)
err_msg_delay = config.error_msg_delay
else
err_msg_delay = initial(config.error_msg_delay)
error_source.next_message_at = world.time + err_msg_delay
/datum/error_viewer/error_source
var/list/errors = list()