diff --git a/monkestation/code/__HELPERS/files.dm b/monkestation/code/__HELPERS/files.dm index 45a305682b0e..a443592385d7 100644 --- a/monkestation/code/__HELPERS/files.dm +++ b/monkestation/code/__HELPERS/files.dm @@ -3,7 +3,7 @@ var/regex/whitelist_regex if(whitelist) // try not to look at it too hard. yes i wrote this by hand. - whitelist_regex = new("(?:\[\\/\\\\\]$|(?:^|\\\\|\\/)(?:[regex_quote_list(whitelist)]|(?:profiler|sendmaps)-\[0-9_\\-\]+|(?:meowtonin-(?:panic-)?\[0-9_\\-\]+))\\.(?:[regex_quote_list(valid_extensions)])$)", "i") + whitelist_regex = new("(?:\[\\/\\\\\]$|(?:^|\\\\|\\/)(?:[regex_quote_list(whitelist)]|(?:profiler|sendmaps|memstat)-\[0-9_\\-\]+|(?:meowtonin-(?:panic-)?\[0-9_\\-\]+))\\.(?:[regex_quote_list(valid_extensions)])$)", "i") // wow why was this ever a parameter var/root = "data/logs/" diff --git a/monkestation/code/controllers/subsystem/memory_stats.dm b/monkestation/code/controllers/subsystem/memory_stats.dm index e82c39403b84..361d878f5a8b 100644 --- a/monkestation/code/controllers/subsystem/memory_stats.dm +++ b/monkestation/code/controllers/subsystem/memory_stats.dm @@ -25,7 +25,8 @@ SUBSYSTEM_DEF(memory_stats) /datum/controller/subsystem/memory_stats/fire(resumed) var/memory_summary = get_memory_stats() if(memory_summary) - aneri_file_write(memory_summary, "data/mem_stat/[GLOB.round_id]-memstat.txt") + var/timestamp = time2text(world.timeofday, "YYYY-MM-DD_hh-mm-ss") + aneri_file_write(json_encode(stats), "[GLOB.log_directory]/profiler/memstat-[timestamp].json") /datum/controller/subsystem/memory_stats/proc/get_memory_stats() if(!aneri_file_exists(MEMORYSTATS_DLL_PATH))