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

Fix error handler printing bogus src.loc and usr.loc info

Browse Source
This commit is contained in:
Leshana
2020-03-30 16:49:22 -04:00
parent 118c669d6a
commit 2e114ede5c
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/_helpers/logging.dm
View File

@@ -259,20 +259,28 @@
return key_name(whom, 1, include_name) return key_name(whom, 1, include_name)
// Helper procs for building detailed log lines // Helper procs for building detailed log lines
//
// These procs must not fail under ANY CIRCUMSTANCES!
//
/datum/proc/log_info_line() /datum/proc/log_info_line()
return "[src] ([type])" return "[src] ([type])"
/atom/log_info_line() /atom/log_info_line()
. = ..()
var/turf/t = get_turf(src) var/turf/t = get_turf(src)
if(istype(t)) if(istype(t))
return "([t]) ([t.x],[t.y],[t.z]) ([t.type])" return "[.] @ [t.log_info_line()]"
else if(loc) else if(loc)
return "([loc]) (0,0,0) ([loc.type])" return "[.] @ ([loc]) (0,0,0) ([loc.type])"
else else
return "(NULL) (0,0,0) (NULL)" return "[.] @ (NULL) (0,0,0) (NULL)"
/turf/log_info_line()
return "([src]) ([x],[y],[z]) ([type])"
/mob/log_info_line() /mob/log_info_line()
return "[..()] ([ckey])" return "[..()] (ckey=[ckey])"
/proc/log_info_line(var/datum/d) /proc/log_info_line(var/datum/d)
if(!d) if(!d)

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

@@ -51,12 +51,12 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
// First, try to make better src/usr info lines // First, try to make better src/usr info lines
if(istype(e_src)) if(istype(e_src))
srcinfo = list(" src: [log_info_line(e_src)]") srcinfo = list(" src: [log_info_line(e_src)]")
locinfo = log_info_line(e_src) var/atom/atom_e_src = e_src
if(locinfo) if(istype(atom_e_src))
srcinfo += " src.loc: [locinfo]" srcinfo += " src.loc: [log_info_line(atom_e_src.loc)]"
if(istype(usr)) if(istype(usr))
usrinfo = list(" usr: [log_info_line(usr)]") usrinfo = list(" usr: [log_info_line(usr)]")
locinfo = log_info_line(usr) locinfo = log_info_line(usr.loc)
if(locinfo) if(locinfo)
usrinfo += " usr.loc: [locinfo]" usrinfo += " usr.loc: [locinfo]"
// The proceeding mess will almost definitely break if error messages are ever changed // The proceeding mess will almost definitely break if error messages are ever changed