Persistent investigate and game logs separated by round ID

code/modules/admin/IsBanned.dm

@@ -63,7 +63,7 @@
 
 		if(!SSdbcore.Connect())
 			log_world("Ban database connection failure. Key [ckeytext] not checked")
-			GLOB.diary << "Ban database connection failure. Key [ckeytext] not checked"
+			GLOB.world_game_log << "Ban database connection failure. Key [ckeytext] not checked"
 			return
 
 		var/ipquery = ""

code/modules/admin/admin_investigate.dm.rej

@@ -0,0 +1,62 @@
+diff a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm	(rejected hunks)
+@@ -1,50 +1,20 @@
+-//By Carnwennan
+-
+-//This system was made as an alternative to all the in-game lists and variables used to log stuff in-game.
+-//lists and variables are great. However, they have several major flaws:
+-//Firstly, they use memory. TGstation has one of the highest memory usage of all the ss13 branches.
+-//Secondly, they are usually stored in an object. This means that they aren't centralised. It also means that
+-//the data is lost when the object is deleted! This is especially annoying for things like the singulo engine!
+-#define INVESTIGATE_DIR "data/investigate/"
+-
+-//SYSTEM
+-/proc/investigate_subject2file(subject)
+-	return file("[INVESTIGATE_DIR][subject].html")
+-
+-/proc/investigate_reset()
+-	if(fdel(INVESTIGATE_DIR))
+-		return 1
+-	return 0
+-
+-/atom/proc/investigate_log(message, subject)
+-	if(!message)
+-		return
+-	var/F = investigate_subject2file(subject)
+-	if(!F)
++atom/proc/investigate_log(message, subject)
++	if(!message || !subject)
+ 		return
++	var/F = file("[GLOB.log_directory]/[subject].html")
+ 	F << "<small>[time_stamp()] \ref[src] ([x],[y],[z])</small> || [src] [message]<br>"
+ 
+-//ADMINVERBS
+ /client/proc/investigate_show( subject in list("hrefs","notes, memos, watchlist","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter", "atmos", "experimentor", "kudzu") )
+ 	set name = "Investigate"
+ 	set category = "Admin"
+ 	if(!holder)
+ 		return
+ 	switch(subject)
+-		if("singulo", "wires", "telesci", "gravity", "records", "cargo", "supermatter", "atmos", "botany")			//general one-round-only stuff
+-			var/F = investigate_subject2file(subject)
+-			if(!F)
+-				to_chat(src, "<font color='red'>Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.</font>")
+-				return
+-			src << browse(F,"window=investigate[subject];size=800x300")
+-		if("hrefs")				//persistent logs and stuff
+-			if(GLOB.href_logfile)
+-				src << browse(GLOB.href_logfile,"window=investigate[subject];size=800x300")
+-			else if(!config.log_hrefs)
+-				to_chat(src, "<span class='danger'>Href logging is off and no logfile was found.</span>")
+-				return
+-			else
+-				to_chat(src, "<span class='danger'>No href logfile was found.</span>")
+-				return
+ 		if("notes, memos, watchlist")
+ 			browse_messages()
++		else
++			var/F = file("[GLOB.log_directory]/[subject].html")
++			if(!fexists(F))
++				to_chat(src, "<span class='danger'>No [subject] logfile was found.</span>")
++				return
++			src << browse(F,"window=investigate[subject];size=800x300")
+\ No newline at end of file

code/modules/admin/admin_ranks.dm

@@ -127,7 +127,7 @@ GLOBAL_PROTECT(admin_ranks)
 	else
 		if(!SSdbcore.Connect())
 			log_world("Failed to connect to database in load_admin_ranks(). Reverting to legacy system.")
-			GLOB.diary << "Failed to connect to database in load_admin_ranks(). Reverting to legacy system."
+			GLOB.world_game_log << "Failed to connect to database in load_admin_ranks(). Reverting to legacy system."
 			config.admin_legacy_system = 1
 			load_admin_ranks()
 			return
@@ -202,7 +202,7 @@ GLOBAL_PROTECT(admin_ranks)
 	else
 		if(!SSdbcore.Connect())
 			log_world("Failed to connect to database in load_admins(). Reverting to legacy system.")
-			GLOB.diary << "Failed to connect to database in load_admins(). Reverting to legacy system."
+			GLOB.world_game_log << "Failed to connect to database in load_admins(). Reverting to legacy system."
 			config.admin_legacy_system = 1
 			load_admins()
 			return

code/modules/admin/admin_verbs.dm

@@ -46,16 +46,14 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
 	/datum/admins/proc/set_admin_notice,/*announcement all clients see when joining the server.*/
 	/client/proc/admin_ghost,			/*allows us to ghost/reenter body at will*/
 	/client/proc/toggle_view_range,		/*changes how far we can see*/
-	/datum/admins/proc/view_txt_log,	/*shows the server log (diary) for today*/
+	/datum/admins/proc/view_txt_log,	/*shows the server log (world_game_log) for today*/
 	/datum/admins/proc/view_atk_log,	/*shows the server combat-log, doesn't do anything presently*/
 	/client/proc/cmd_admin_subtle_message,	/*send an message to somebody as a 'voice in their head'*/
 	/client/proc/cmd_admin_delete,		/*delete an instance/object/mob/etc*/
 	/client/proc/cmd_admin_check_contents,	/*displays the contents of an instance*/
 	/client/proc/check_antagonists,		/*shows all antags*/
 	/datum/admins/proc/access_news_network,	/*allows access of newscasters*/
-	/client/proc/giveruntimelog,		/*allows us to give access to runtime logs to somebody*/
-	/client/proc/getruntimelog,			/*allows us to access runtime logs to somebody*/
-	/client/proc/getserverlog,			/*allows us to fetch server logs (diary) for other days*/
+	/client/proc/getserverlog,			/*allows us to fetch server logs (world_game_log) for other days*/
 	/client/proc/jumptocoord,			/*we ghost and jump to a coordinate*/
 	/client/proc/Getmob,				/*teleports a mob to our location*/
 	/client/proc/Getkey,				/*teleports a mob with a certain ckey to our location*/
@@ -116,7 +114,6 @@ GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer())
 	/datum/admins/proc/end_round,
 	/datum/admins/proc/delay,
 	/datum/admins/proc/toggleaban,
-	/client/proc/toggle_log_hrefs,
 	/client/proc/everyone_random,
 	/datum/admins/proc/toggleAI,
 	/client/proc/cmd_admin_delete,		/*delete an instance/object/mob/etc*/
@@ -223,7 +220,6 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 	/datum/admins/proc/restart,
 	/datum/admins/proc/delay,
 	/datum/admins/proc/toggleaban,
-	/client/proc/toggle_log_hrefs,
 	/client/proc/everyone_random,
 	/datum/admins/proc/toggleAI,
 	/client/proc/restart_controller,
@@ -638,19 +634,6 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 		togglebuildmode(src.mob)
 	SSblackbox.add_details("admin_verb","Toggle Build Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-/client/proc/toggle_log_hrefs()
-	set name = "Toggle href logging"
-	set category = "Server"
-	if(!holder)
-		return
-	if(config)
-		if(config.log_hrefs)
-			config.log_hrefs = 0
-			to_chat(src, "<b>Stopped logging hrefs</b>")
-		else
-			config.log_hrefs = 1
-			to_chat(src, "<b>Started logging hrefs</b>")
-
 /client/proc/check_ai_laws()
 	set name = "Check AI Laws"
 	set category = "Admin"

code/modules/admin/verbs/getlogs.dm

@@ -1,62 +1,3 @@
-/*
-	HOW DO I LOG RUNTIMES?
-	Firstly, start dreamdeamon if it isn't already running. Then select "world>Log Session" (or press the F3 key)
-	navigate the popup window to the data/logs/runtimes/ folder from where your tgstation .dmb is located.
-	(you may have to make this folder yourself)
-
-	OPTIONAL: 	you can select the little checkbox down the bottom to make dreamdeamon save the log everytime you
-				start a world. Just remember to repeat these steps with a new name when you update to a new revision!
-
-	Save it with the name of the revision your server uses (e.g. r3459.txt).
-	Game Masters will now be able to grant access any runtime logs you have archived this way!
-	This will allow us to gather information on bugs across multiple servers and make maintaining the TG
-	codebase for the entire /TG/station commuity a TONNE easier :3 Thanks for your help!
-*/
-
-
-//This proc allows Game Masters to grant a client access to the .getruntimelog verb
-//Permissions expire at the end of each round.
-//Runtimes can be used to meta or spot game-crashing exploits so it's advised to only grant coders that
-//you trust access. Also, it may be wise to ensure that they are not going to play in the current round.
-/client/proc/giveruntimelog()
-	set name = ".giveruntimelog"
-	set desc = "Give somebody access to any session logfiles saved to the /log/runtime/ folder."
-	set category = null
-
-	if(!src.holder)
-		to_chat(src, "<font color='red'>Only Admins may use this command.</font>")
-		return
-
-	var/client/target = input(src,"Choose somebody to grant access to the server's runtime logs (permissions expire at the end of each round):","Grant Permissions",null) as null|anything in GLOB.clients
-	if(!istype(target,/client))
-		to_chat(src, "<font color='red'>Error: giveruntimelog(): Client not found.</font>")
-		return
-
-	target.verbs |= /client/proc/getruntimelog
-	to_chat(target, "<font color='red'>You have been granted access to runtime logs. Please use them responsibly or risk being banned.</font>")
-	return
-
-
-//This proc allows download of runtime logs saved within the data/logs/ folder by dreamdeamon.
-//It works similarly to show-server-log.
-/client/proc/getruntimelog()
-	set name = ".getruntimelog"
-	set desc = "Retrieve any session logfiles saved by dreamdeamon."
-	set category = null
-
-	var/path = browse_files("data/logs/runtimes/")
-	if(!path)
-		return
-
-	if(file_spam_check())
-		return
-
-	message_admins("[key_name_admin(src)] accessed file: [path]")
-	src << ftp(file(path))
-	to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.")
-	return
-
-
 //This proc allows download of past server logs saved within the data/logs/ folder.
 //It works similarly to show-server-log.
 /client/proc/getserverlog()
@@ -83,10 +24,10 @@
 /datum/admins/proc/view_txt_log()
 	set category = "Admin"
 	set name = "Show Server Log"
-	set desc = "Shows today's server log."
+	set desc = "Shows server log for this round."
 
-	if(fexists("[GLOB.diary]"))
-		src << ftp(GLOB.diary)
+	if(fexists("[GLOB.world_game_log]"))
+		src << ftp(GLOB.world_game_log)
 	else
 		to_chat(src, "<font color='red'>Server log not found, try using .getserverlog.</font>")
 		return
@@ -97,10 +38,10 @@
 /datum/admins/proc/view_atk_log()
 	set category = "Admin"
 	set name = "Show Server Attack Log"
-	set desc = "Shows today's server attack log."
+	set desc = "Shows server attack log for this round."
 
-	if(fexists("[GLOB.diaryofmeanpeople]"))
-		src << ftp(GLOB.diaryofmeanpeople)
+	if(fexists("[GLOB.world_attack_log]"))
+		src << ftp(GLOB.world_attack_log)
 	else
 		to_chat(src, "<font color='red'>Server attack log not found, try using .getserverlog.</font>")
 		return

code/modules/client/client_procs.dm

@@ -292,13 +292,13 @@ GLOBAL_LIST(external_rsc_urls)
 	set_client_age_from_db()
 	var/cached_player_age = player_age //we have to cache this because other shit may change it and we need it's current value now down below.
 	if (isnum(cached_player_age) && cached_player_age == -1) //first connection
-		player_age = 0	
+		player_age = 0
 	if(!IsGuestKey(key) && SSdbcore.IsConnected())
 		findJoinDate()
 
 	sync_client_with_db(tdata)
-	
-	
+
+
 	if (isnum(cached_player_age) && cached_player_age == -1) //first connection
 		if (config.panic_bunker && !holder && !(ckey in GLOB.deadmins))
 			log_access("Failed Login: [key] - New account attempting to connect during panic bunker")

code/modules/client/client_procs.dm.rej

@@ -0,0 +1,41 @@
+diff a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm	(rejected hunks)
+@@ -70,8 +70,7 @@
+ 			return
+ 
+ 	//Logs all hrefs
+-	if(config && config.log_hrefs && GLOB.href_logfile)
+-		GLOB.href_logfile << "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>"
++	GLOB.world_href_log << "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>"
+ 
+ 	// Admin PM
+ 	if(href_list["priv_msg"])
+@@ -295,7 +294,7 @@ GLOBAL_LIST(external_rsc_urls)
+ 				send2irc_adminless_only("New-user", "[key_name(src)] is connecting for the first time!")
+ 	else if (isnum(cached_player_age) && cached_player_age < config.notify_new_player_age)
+ 		message_admins("New user: [key_name_admin(src)] just connected with an age of [cached_player_age] day[(player_age==1?"":"s")]")
+-	
++
+ 	get_message_output("watchlist entry", ckey)
+ 	check_ip_intel()
+ 
+@@ -340,7 +339,7 @@ GLOBAL_LIST(external_rsc_urls)
+ 		adminGreet(1)
+ 		holder.owner = null
+ 		GLOB.admins -= src
+-    
++
+ 		if (!GLOB.admins.len && SSticker.IsRoundInProgress()) //Only report this stuff if we are currently playing.
+ 			if(!GLOB.admins.len) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
+ 				var/cheesy_message = pick(
+@@ -357,9 +356,9 @@ GLOBAL_LIST(external_rsc_urls)
+ 					"What happened? Where has everyone gone?",\
+ 					"Forever alone :("\
+ 				)
+-				
++
+ 				send2irc("Server", "[cheesy_message] (No admins online)")
+-	
++
+ 	GLOB.ahelp_tickets.ClientLogout(src)
+ 	GLOB.directory -= ckey
+ 	GLOB.clients -= src

code/modules/error_handler/error_handler.dm

@@ -6,7 +6,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 	if(!istype(E)) //Something threw an unusual exception
 		log_world("\[[time_stamp()]] Uncaught exception: [E]")
 		return ..()
-	
+
 	var/static/list/error_last_seen = list()
 	var/static/list/error_cooldown = list() /* Error_cooldown items will either be positive(cooldown time) or negative(silenced error)
 												If negative, starts at -1, and goes down by 1 each time that error gets skipped*/
@@ -107,9 +107,8 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 		if (split[i] != "")
 			split[i] = "\[[time2text(world.timeofday,"hh:mm:ss")]\][split[i]]"
 	E.desc = jointext(split, "\n")
-	if(config && config.log_runtimes)
-		world.log = GLOB.runtime_diary
-		..(E)
+	world.log = GLOB.world_runtime_log
+	..(E)
 
 	world.log = null
 

code/modules/food_and_drinks/kitchen_machinery/gibber.dm

@@ -31,7 +31,7 @@
 					break
 
 		if(!input_plate)
-			GLOB.diary << "a [src] didn't find an input plate."
+			GLOB.world_game_log << "a [src] didn't find an input plate."
 			return
 
 /obj/machinery/gibber/autogibber/Bumped(atom/A)