Unorphans the blackbox
This commit is contained in:
CitadelStationBot
@@ -43,9 +43,9 @@
|
||||
switch(controller)
|
||||
if("Master")
|
||||
Recreate_MC()
|
||||
feedback_add_details("admin_verb","Restart Master Controller")
|
||||
SSblackbox.add_details("admin_verb","Restart Master Controller")
|
||||
if("Failsafe")
|
||||
new /datum/controller/failsafe()
|
||||
feedback_add_details("admin_verb","Restart Failsafe Controller")
|
||||
SSblackbox.add_details("admin_verb","Restart Failsafe Controller")
|
||||
|
||||
message_admins("Admin [key_name_admin(usr)] has restarted the [controller] controller.")
|
||||
|
||||
253
code/controllers/subsystem/blackbox.dm
Normal file
253
code/controllers/subsystem/blackbox.dm
Normal file
@@ -0,0 +1,253 @@
|
||||
GLOBAL_DATUM_INIT(blackbox, /datum/feedback, new)
|
||||
|
||||
//the feedback datum; stores all feedback
|
||||
/datum/feedback
|
||||
var/list/messages = list()
|
||||
var/list/messages_admin = list()
|
||||
|
||||
var/list/msg_common = list()
|
||||
var/list/msg_science = list()
|
||||
var/list/msg_command = list()
|
||||
var/list/msg_medical = list()
|
||||
var/list/msg_engineering = list()
|
||||
var/list/msg_security = list()
|
||||
var/list/msg_deathsquad = list()
|
||||
var/list/msg_syndicate = list()
|
||||
var/list/msg_service = list()
|
||||
var/list/msg_cargo = list()
|
||||
|
||||
var/list/datum/feedback_variable/feedback = new()
|
||||
|
||||
/datum/feedback/proc/find_feedback_datum(variable)
|
||||
for (var/datum/feedback_variable/FV in feedback)
|
||||
if (FV.get_variable() == variable)
|
||||
return FV
|
||||
var/datum/feedback_variable/FV = new(variable)
|
||||
feedback += FV
|
||||
return FV
|
||||
|
||||
/datum/feedback/proc/get_round_feedback()
|
||||
return feedback
|
||||
|
||||
/datum/feedback/proc/round_end_data_gathering()
|
||||
var/pda_msg_amt = 0
|
||||
var/rc_msg_amt = 0
|
||||
|
||||
for (var/obj/machinery/message_server/MS in GLOB.message_servers)
|
||||
if (MS.pda_msgs.len > pda_msg_amt)
|
||||
pda_msg_amt = MS.pda_msgs.len
|
||||
if (MS.rc_msgs.len > rc_msg_amt)
|
||||
rc_msg_amt = MS.rc_msgs.len
|
||||
|
||||
feedback_set_details("radio_usage","")
|
||||
|
||||
feedback_add_details("radio_usage","COM-[msg_common.len]")
|
||||
feedback_add_details("radio_usage","SCI-[msg_science.len]")
|
||||
feedback_add_details("radio_usage","HEA-[msg_command.len]")
|
||||
feedback_add_details("radio_usage","MED-[msg_medical.len]")
|
||||
feedback_add_details("radio_usage","ENG-[msg_engineering.len]")
|
||||
feedback_add_details("radio_usage","SEC-[msg_security.len]")
|
||||
feedback_add_details("radio_usage","DTH-[msg_deathsquad.len]")
|
||||
feedback_add_details("radio_usage","SYN-[msg_syndicate.len]")
|
||||
feedback_add_details("radio_usage","SRV-[msg_service.len]")
|
||||
feedback_add_details("radio_usage","CAR-[msg_cargo.len]")
|
||||
feedback_add_details("radio_usage","OTH-[messages.len]")
|
||||
feedback_add_details("radio_usage","PDA-[pda_msg_amt]")
|
||||
feedback_add_details("radio_usage","RC-[rc_msg_amt]")
|
||||
|
||||
feedback_set_details("round_end","[time2text(world.realtime)]") //This one MUST be the last one that gets set.
|
||||
|
||||
//This proc is only to be called at round end.
|
||||
/datum/feedback/proc/save_all_data_to_sql()
|
||||
if (!feedback) return
|
||||
|
||||
round_end_data_gathering() //round_end time logging and some other data processing
|
||||
if (!SSdbcore.Connect()) return
|
||||
var/round_id
|
||||
|
||||
var/datum/DBQuery/query_feedback_max_id = SSdbcore.NewQuery("SELECT MAX(round_id) AS round_id FROM [format_table_name("feedback")]")
|
||||
if(!query_feedback_max_id.Execute())
|
||||
return
|
||||
while (query_feedback_max_id.NextRow())
|
||||
round_id = query_feedback_max_id.item[1]
|
||||
|
||||
if (!isnum(round_id))
|
||||
round_id = text2num(round_id)
|
||||
round_id++
|
||||
|
||||
var/sqlrowlist = ""
|
||||
|
||||
for (var/datum/feedback_variable/FV in feedback)
|
||||
if (sqlrowlist != "")
|
||||
sqlrowlist += ", " //a comma (,) at the start of the first row to insert will trigger a SQL error
|
||||
|
||||
sqlrowlist += "(null, Now(), [round_id], \"[sanitizeSQL(FV.get_variable())]\", [FV.get_value()], \"[sanitizeSQL(FV.get_details())]\")"
|
||||
|
||||
if (sqlrowlist == "")
|
||||
return
|
||||
|
||||
var/datum/DBQuery/query_feedback_save = SSdbcore.NewQuery("INSERT DELAYED IGNORE INTO [format_table_name("feedback")] VALUES " + sqlrowlist)
|
||||
query_feedback_save.Execute()
|
||||
|
||||
|
||||
/proc/feedback_set(variable,value)
|
||||
if(!GLOB.blackbox)
|
||||
return
|
||||
|
||||
var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable)
|
||||
|
||||
if(!FV)
|
||||
return
|
||||
|
||||
FV.set_value(value)
|
||||
|
||||
/proc/feedback_inc(variable,value)
|
||||
if(!GLOB.blackbox)
|
||||
return
|
||||
|
||||
var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable)
|
||||
|
||||
if(!FV)
|
||||
return
|
||||
|
||||
FV.inc(value)
|
||||
|
||||
/proc/feedback_dec(variable,value)
|
||||
if(!GLOB.blackbox)
|
||||
return
|
||||
|
||||
var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable)
|
||||
|
||||
if(!FV)
|
||||
return
|
||||
|
||||
FV.dec(value)
|
||||
|
||||
/proc/feedback_set_details(variable,details)
|
||||
if(!GLOB.blackbox)
|
||||
return
|
||||
|
||||
var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable)
|
||||
|
||||
if(!FV)
|
||||
return
|
||||
|
||||
FV.set_details(details)
|
||||
|
||||
/proc/feedback_add_details(variable,details)
|
||||
if(!GLOB.blackbox)
|
||||
return
|
||||
|
||||
var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable)
|
||||
|
||||
if(!FV)
|
||||
return
|
||||
|
||||
FV.add_details(details)
|
||||
|
||||
//feedback variable datum, for storing all kinds of data
|
||||
/datum/feedback_variable
|
||||
var/variable
|
||||
var/value
|
||||
var/details
|
||||
|
||||
/datum/feedback_variable/New(var/param_variable,var/param_value = 0)
|
||||
variable = param_variable
|
||||
value = param_value
|
||||
|
||||
/datum/feedback_variable/proc/inc(num = 1)
|
||||
if (isnum(value))
|
||||
value += num
|
||||
else
|
||||
value = text2num(value)
|
||||
if (isnum(value))
|
||||
value += num
|
||||
else
|
||||
value = num
|
||||
|
||||
/datum/feedback_variable/proc/dec(num = 1)
|
||||
if (isnum(value))
|
||||
value -= num
|
||||
else
|
||||
value = text2num(value)
|
||||
if (isnum(value))
|
||||
value -= num
|
||||
else
|
||||
value = -num
|
||||
|
||||
/datum/feedback_variable/proc/set_value(num)
|
||||
if (isnum(num))
|
||||
value = num
|
||||
|
||||
/datum/feedback_variable/proc/get_value()
|
||||
if (!isnum(value))
|
||||
return 0
|
||||
return value
|
||||
|
||||
/datum/feedback_variable/proc/get_variable()
|
||||
return variable
|
||||
|
||||
/datum/feedback_variable/proc/set_details(text)
|
||||
if (istext(text))
|
||||
details = text
|
||||
|
||||
/datum/feedback_variable/proc/add_details(text)
|
||||
if (istext(text))
|
||||
text = replacetext(text, " ", "_")
|
||||
if (!details)
|
||||
details = text
|
||||
else
|
||||
details += " [text]"
|
||||
|
||||
/datum/feedback_variable/proc/get_details()
|
||||
return details
|
||||
|
||||
/datum/feedback_variable/proc/get_parsed()
|
||||
return list(variable,value,details)
|
||||
|
||||
//sql reporting procs
|
||||
/proc/sql_poll_population()
|
||||
if(!config.sql_enabled)
|
||||
return
|
||||
if(!SSdbcore.Connect())
|
||||
return
|
||||
var/playercount = 0
|
||||
for(var/mob/M in GLOB.player_list)
|
||||
if(M.client)
|
||||
playercount += 1
|
||||
var/admincount = GLOB.admins.len
|
||||
var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON('[world.internet_address]'), '[world.port]')")
|
||||
query_record_playercount.Execute()
|
||||
|
||||
/proc/sql_report_death(mob/living/L)
|
||||
if(!config.sql_enabled)
|
||||
return
|
||||
if(!SSdbcore.Connect())
|
||||
return
|
||||
if(!L || !L.key || !L.mind)
|
||||
return
|
||||
var/turf/T = get_turf(L)
|
||||
var/area/placeofdeath = get_area(T.loc)
|
||||
var/sqlname = sanitizeSQL(L.real_name)
|
||||
var/sqlkey = sanitizeSQL(L.ckey)
|
||||
var/sqljob = sanitizeSQL(L.mind.assigned_role)
|
||||
var/sqlspecial = sanitizeSQL(L.mind.special_role)
|
||||
var/sqlpod = sanitizeSQL(placeofdeath.name)
|
||||
var/laname
|
||||
var/lakey
|
||||
if(L.lastattacker && ismob(L.lastattacker))
|
||||
var/mob/LA = L.lastattacker
|
||||
laname = sanitizeSQL(LA.real_name)
|
||||
lakey = sanitizeSQL(LA.key)
|
||||
var/sqlgender = sanitizeSQL(L.gender)
|
||||
var/sqlbrute = sanitizeSQL(L.getBruteLoss())
|
||||
var/sqlfire = sanitizeSQL(L.getFireLoss())
|
||||
var/sqlbrain = sanitizeSQL(L.getBrainLoss())
|
||||
var/sqloxy = sanitizeSQL(L.getOxyLoss())
|
||||
var/sqltox = sanitizeSQL(L.getStaminaLoss())
|
||||
var/sqlclone = sanitizeSQL(L.getStaminaLoss())
|
||||
var/sqlstamina = sanitizeSQL(L.getStaminaLoss())
|
||||
var/coord = sanitizeSQL("[L.x], [L.y], [L.z]")
|
||||
var/map = sanitizeSQL(SSmapping.config.map_name)
|
||||
var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', INET_ATON('[world.internet_address]'), '[world.port]')")
|
||||
query_report_death.Execute()
|
||||
512
code/controllers/subsystem/blackbox.dm.rej
Normal file
512
code/controllers/subsystem/blackbox.dm.rej
Normal file
@@ -0,0 +1,512 @@
|
||||
diff a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm (rejected hunks)
|
||||
@@ -1,253 +1,257 @@
|
||||
-GLOBAL_DATUM_INIT(blackbox, /datum/feedback, new)
|
||||
-
|
||||
-//the feedback datum; stores all feedback
|
||||
-/datum/feedback
|
||||
- var/list/messages = list()
|
||||
- var/list/messages_admin = list()
|
||||
-
|
||||
- var/list/msg_common = list()
|
||||
- var/list/msg_science = list()
|
||||
- var/list/msg_command = list()
|
||||
- var/list/msg_medical = list()
|
||||
- var/list/msg_engineering = list()
|
||||
- var/list/msg_security = list()
|
||||
- var/list/msg_deathsquad = list()
|
||||
- var/list/msg_syndicate = list()
|
||||
- var/list/msg_service = list()
|
||||
- var/list/msg_cargo = list()
|
||||
-
|
||||
- var/list/datum/feedback_variable/feedback = new()
|
||||
-
|
||||
-/datum/feedback/proc/find_feedback_datum(variable)
|
||||
- for (var/datum/feedback_variable/FV in feedback)
|
||||
- if (FV.get_variable() == variable)
|
||||
- return FV
|
||||
- var/datum/feedback_variable/FV = new(variable)
|
||||
- feedback += FV
|
||||
- return FV
|
||||
-
|
||||
-/datum/feedback/proc/get_round_feedback()
|
||||
- return feedback
|
||||
-
|
||||
-/datum/feedback/proc/round_end_data_gathering()
|
||||
- var/pda_msg_amt = 0
|
||||
- var/rc_msg_amt = 0
|
||||
-
|
||||
- for (var/obj/machinery/message_server/MS in GLOB.message_servers)
|
||||
- if (MS.pda_msgs.len > pda_msg_amt)
|
||||
- pda_msg_amt = MS.pda_msgs.len
|
||||
- if (MS.rc_msgs.len > rc_msg_amt)
|
||||
- rc_msg_amt = MS.rc_msgs.len
|
||||
-
|
||||
- feedback_set_details("radio_usage","")
|
||||
-
|
||||
- feedback_add_details("radio_usage","COM-[msg_common.len]")
|
||||
- feedback_add_details("radio_usage","SCI-[msg_science.len]")
|
||||
- feedback_add_details("radio_usage","HEA-[msg_command.len]")
|
||||
- feedback_add_details("radio_usage","MED-[msg_medical.len]")
|
||||
- feedback_add_details("radio_usage","ENG-[msg_engineering.len]")
|
||||
- feedback_add_details("radio_usage","SEC-[msg_security.len]")
|
||||
- feedback_add_details("radio_usage","DTH-[msg_deathsquad.len]")
|
||||
- feedback_add_details("radio_usage","SYN-[msg_syndicate.len]")
|
||||
- feedback_add_details("radio_usage","SRV-[msg_service.len]")
|
||||
- feedback_add_details("radio_usage","CAR-[msg_cargo.len]")
|
||||
- feedback_add_details("radio_usage","OTH-[messages.len]")
|
||||
- feedback_add_details("radio_usage","PDA-[pda_msg_amt]")
|
||||
- feedback_add_details("radio_usage","RC-[rc_msg_amt]")
|
||||
-
|
||||
- feedback_set_details("round_end","[time2text(world.realtime)]") //This one MUST be the last one that gets set.
|
||||
-
|
||||
-//This proc is only to be called at round end.
|
||||
-/datum/feedback/proc/save_all_data_to_sql()
|
||||
- if (!feedback) return
|
||||
-
|
||||
- round_end_data_gathering() //round_end time logging and some other data processing
|
||||
- if (!GLOB.dbcon.Connect()) return
|
||||
- var/round_id
|
||||
-
|
||||
- var/DBQuery/query_feedback_max_id = GLOB.dbcon.NewQuery("SELECT MAX(round_id) AS round_id FROM [format_table_name("feedback")]")
|
||||
- if(!query_feedback_max_id.Execute())
|
||||
- return
|
||||
- while (query_feedback_max_id.NextRow())
|
||||
- round_id = query_feedback_max_id.item[1]
|
||||
-
|
||||
- if (!isnum(round_id))
|
||||
- round_id = text2num(round_id)
|
||||
- round_id++
|
||||
-
|
||||
- var/sqlrowlist = ""
|
||||
-
|
||||
- for (var/datum/feedback_variable/FV in feedback)
|
||||
- if (sqlrowlist != "")
|
||||
- sqlrowlist += ", " //a comma (,) at the start of the first row to insert will trigger a SQL error
|
||||
-
|
||||
- sqlrowlist += "(null, Now(), [round_id], \"[sanitizeSQL(FV.get_variable())]\", [FV.get_value()], \"[sanitizeSQL(FV.get_details())]\")"
|
||||
-
|
||||
- if (sqlrowlist == "")
|
||||
- return
|
||||
-
|
||||
- var/DBQuery/query_feedback_save = GLOB.dbcon.NewQuery("INSERT DELAYED IGNORE INTO [format_table_name("feedback")] VALUES " + sqlrowlist)
|
||||
- query_feedback_save.Execute()
|
||||
-
|
||||
-
|
||||
-/proc/feedback_set(variable,value)
|
||||
- if(!GLOB.blackbox)
|
||||
- return
|
||||
-
|
||||
- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable)
|
||||
-
|
||||
- if(!FV)
|
||||
- return
|
||||
-
|
||||
- FV.set_value(value)
|
||||
-
|
||||
-/proc/feedback_inc(variable,value)
|
||||
- if(!GLOB.blackbox)
|
||||
- return
|
||||
-
|
||||
- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable)
|
||||
-
|
||||
- if(!FV)
|
||||
- return
|
||||
-
|
||||
- FV.inc(value)
|
||||
-
|
||||
-/proc/feedback_dec(variable,value)
|
||||
- if(!GLOB.blackbox)
|
||||
- return
|
||||
-
|
||||
- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable)
|
||||
-
|
||||
- if(!FV)
|
||||
- return
|
||||
-
|
||||
- FV.dec(value)
|
||||
-
|
||||
-/proc/feedback_set_details(variable,details)
|
||||
- if(!GLOB.blackbox)
|
||||
- return
|
||||
-
|
||||
- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable)
|
||||
-
|
||||
- if(!FV)
|
||||
- return
|
||||
-
|
||||
- FV.set_details(details)
|
||||
-
|
||||
-/proc/feedback_add_details(variable,details)
|
||||
- if(!GLOB.blackbox)
|
||||
- return
|
||||
-
|
||||
- var/datum/feedback_variable/FV = GLOB.blackbox.find_feedback_datum(variable)
|
||||
-
|
||||
- if(!FV)
|
||||
- return
|
||||
-
|
||||
- FV.add_details(details)
|
||||
-
|
||||
-//feedback variable datum, for storing all kinds of data
|
||||
-/datum/feedback_variable
|
||||
- var/variable
|
||||
- var/value
|
||||
- var/details
|
||||
-
|
||||
-/datum/feedback_variable/New(var/param_variable,var/param_value = 0)
|
||||
- variable = param_variable
|
||||
- value = param_value
|
||||
-
|
||||
-/datum/feedback_variable/proc/inc(num = 1)
|
||||
- if (isnum(value))
|
||||
- value += num
|
||||
- else
|
||||
- value = text2num(value)
|
||||
- if (isnum(value))
|
||||
- value += num
|
||||
- else
|
||||
- value = num
|
||||
-
|
||||
-/datum/feedback_variable/proc/dec(num = 1)
|
||||
- if (isnum(value))
|
||||
- value -= num
|
||||
- else
|
||||
- value = text2num(value)
|
||||
- if (isnum(value))
|
||||
- value -= num
|
||||
- else
|
||||
- value = -num
|
||||
-
|
||||
-/datum/feedback_variable/proc/set_value(num)
|
||||
- if (isnum(num))
|
||||
- value = num
|
||||
-
|
||||
-/datum/feedback_variable/proc/get_value()
|
||||
- if (!isnum(value))
|
||||
- return 0
|
||||
- return value
|
||||
-
|
||||
-/datum/feedback_variable/proc/get_variable()
|
||||
- return variable
|
||||
-
|
||||
-/datum/feedback_variable/proc/set_details(text)
|
||||
- if (istext(text))
|
||||
- details = text
|
||||
-
|
||||
-/datum/feedback_variable/proc/add_details(text)
|
||||
- if (istext(text))
|
||||
- text = replacetext(text, " ", "_")
|
||||
- if (!details)
|
||||
- details = text
|
||||
- else
|
||||
- details += " [text]"
|
||||
-
|
||||
-/datum/feedback_variable/proc/get_details()
|
||||
- return details
|
||||
-
|
||||
-/datum/feedback_variable/proc/get_parsed()
|
||||
- return list(variable,value,details)
|
||||
-
|
||||
-//sql reporting procs
|
||||
-/proc/sql_poll_population()
|
||||
- if(!config.sql_enabled)
|
||||
- return
|
||||
- if(!GLOB.dbcon.Connect())
|
||||
- return
|
||||
- var/playercount = 0
|
||||
- for(var/mob/M in GLOB.player_list)
|
||||
- if(M.client)
|
||||
- playercount += 1
|
||||
- var/admincount = GLOB.admins.len
|
||||
- var/DBQuery/query_record_playercount = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON('[world.internet_address]'), '[world.port]')")
|
||||
- query_record_playercount.Execute()
|
||||
-
|
||||
-/proc/sql_report_death(mob/living/L)
|
||||
- if(!config.sql_enabled)
|
||||
- return
|
||||
- if(!GLOB.dbcon.Connect())
|
||||
- return
|
||||
- if(!L || !L.key || !L.mind)
|
||||
- return
|
||||
- var/turf/T = get_turf(L)
|
||||
- var/area/placeofdeath = get_area(T.loc)
|
||||
- var/sqlname = sanitizeSQL(L.real_name)
|
||||
- var/sqlkey = sanitizeSQL(L.ckey)
|
||||
- var/sqljob = sanitizeSQL(L.mind.assigned_role)
|
||||
- var/sqlspecial = sanitizeSQL(L.mind.special_role)
|
||||
- var/sqlpod = sanitizeSQL(placeofdeath.name)
|
||||
- var/laname
|
||||
- var/lakey
|
||||
- if(L.lastattacker && ismob(L.lastattacker))
|
||||
- var/mob/LA = L.lastattacker
|
||||
- laname = sanitizeSQL(LA.real_name)
|
||||
- lakey = sanitizeSQL(LA.key)
|
||||
- var/sqlgender = sanitizeSQL(L.gender)
|
||||
- var/sqlbrute = sanitizeSQL(L.getBruteLoss())
|
||||
- var/sqlfire = sanitizeSQL(L.getFireLoss())
|
||||
- var/sqlbrain = sanitizeSQL(L.getBrainLoss())
|
||||
- var/sqloxy = sanitizeSQL(L.getOxyLoss())
|
||||
- var/sqltox = sanitizeSQL(L.getStaminaLoss())
|
||||
- var/sqlclone = sanitizeSQL(L.getStaminaLoss())
|
||||
- var/sqlstamina = sanitizeSQL(L.getStaminaLoss())
|
||||
- var/coord = sanitizeSQL("[L.x], [L.y], [L.z]")
|
||||
- var/map = sanitizeSQL(SSmapping.config.map_name)
|
||||
- var/DBQuery/query_report_death = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', INET_ATON('[world.internet_address]'), '[world.port]')")
|
||||
- query_report_death.Execute()
|
||||
+SUBSYSTEM_DEF(blackbox)
|
||||
+ name = "Blackbox"
|
||||
+ wait = 6000
|
||||
+ flags = SS_NO_TICK_CHECK
|
||||
+
|
||||
+ var/list/msg_common = list()
|
||||
+ var/list/msg_science = list()
|
||||
+ var/list/msg_command = list()
|
||||
+ var/list/msg_medical = list()
|
||||
+ var/list/msg_engineering = list()
|
||||
+ var/list/msg_security = list()
|
||||
+ var/list/msg_deathsquad = list()
|
||||
+ var/list/msg_syndicate = list()
|
||||
+ var/list/msg_service = list()
|
||||
+ var/list/msg_cargo = list()
|
||||
+ var/list/msg_other = list()
|
||||
+
|
||||
+ var/list/feedback = list() //list of datum/feedback_variable
|
||||
+
|
||||
+//poll population
|
||||
+/datum/controller/subsystem/blackbox/fire()
|
||||
+ if(!GLOB.dbcon.Connect())
|
||||
+ return
|
||||
+ var/playercount = 0
|
||||
+ for(var/mob/M in GLOB.player_list)
|
||||
+ if(M.client)
|
||||
+ playercount += 1
|
||||
+ var/admincount = GLOB.admins.len
|
||||
+ var/DBQuery/query_record_playercount = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON('[world.internet_address]'), '[world.port]')")
|
||||
+ query_record_playercount.Execute()
|
||||
+
|
||||
+/datum/controller/subsystem/blackbox/Recover()
|
||||
+ msg_common = SSblackbox.msg_common
|
||||
+ msg_science = SSblackbox.msg_science
|
||||
+ msg_command = SSblackbox.msg_command
|
||||
+ msg_medical = SSblackbox.msg_medical
|
||||
+ msg_engineering = SSblackbox.msg_engineering
|
||||
+ msg_security = SSblackbox.msg_security
|
||||
+ msg_deathsquad = SSblackbox.msg_deathsquad
|
||||
+ msg_syndicate = SSblackbox.msg_syndicate
|
||||
+ msg_service = SSblackbox.msg_service
|
||||
+ msg_cargo = SSblackbox.msg_cargo
|
||||
+ msg_other = SSblackbox.msg_other
|
||||
+
|
||||
+ feedback = SSblackbox.feedback
|
||||
+
|
||||
+//no touchie
|
||||
+/datum/controller/subsystem/blackbox/can_vv_get(var_name)
|
||||
+ if(var_name == "feedback")
|
||||
+ return FALSE
|
||||
+ return ..()
|
||||
+
|
||||
+/datum/controller/subsystem/blackbox/vv_edit_var(var_name, var_value)
|
||||
+ return FALSE
|
||||
+
|
||||
+/datum/controller/subsystem/blackbox/Shutdown()
|
||||
+ var/pda_msg_amt = 0
|
||||
+ var/rc_msg_amt = 0
|
||||
+
|
||||
+ for (var/obj/machinery/message_server/MS in GLOB.message_servers)
|
||||
+ if (MS.pda_msgs.len > pda_msg_amt)
|
||||
+ pda_msg_amt = MS.pda_msgs.len
|
||||
+ if (MS.rc_msgs.len > rc_msg_amt)
|
||||
+ rc_msg_amt = MS.rc_msgs.len
|
||||
+
|
||||
+ set_details("radio_usage","")
|
||||
+
|
||||
+ add_details("radio_usage","COM-[msg_common.len]")
|
||||
+ add_details("radio_usage","SCI-[msg_science.len]")
|
||||
+ add_details("radio_usage","HEA-[msg_command.len]")
|
||||
+ add_details("radio_usage","MED-[msg_medical.len]")
|
||||
+ add_details("radio_usage","ENG-[msg_engineering.len]")
|
||||
+ add_details("radio_usage","SEC-[msg_security.len]")
|
||||
+ add_details("radio_usage","DTH-[msg_deathsquad.len]")
|
||||
+ add_details("radio_usage","SYN-[msg_syndicate.len]")
|
||||
+ add_details("radio_usage","SRV-[msg_service.len]")
|
||||
+ add_details("radio_usage","CAR-[msg_cargo.len]")
|
||||
+ add_details("radio_usage","OTH-[msg_other.len]")
|
||||
+ add_details("radio_usage","PDA-[pda_msg_amt]")
|
||||
+ add_details("radio_usage","RC-[rc_msg_amt]")
|
||||
+
|
||||
+ set_details("round_end","[time2text(world.realtime)]") //This one MUST be the last one that gets set.
|
||||
+
|
||||
+ if (!GLOB.dbcon.Connect())
|
||||
+ return
|
||||
+
|
||||
+ var/round_id
|
||||
+
|
||||
+ var/DBQuery/query_feedback_max_id = GLOB.dbcon.NewQuery("SELECT MAX(round_id) AS round_id FROM [format_table_name("feedback")]")
|
||||
+ if(!query_feedback_max_id.Execute())
|
||||
+ return
|
||||
+ while (query_feedback_max_id.NextRow())
|
||||
+ round_id = query_feedback_max_id.item[1]
|
||||
+
|
||||
+ if (!isnum(round_id))
|
||||
+ round_id = text2num(round_id)
|
||||
+ round_id++
|
||||
+
|
||||
+ var/sqlrowlist = ""
|
||||
+
|
||||
+ for (var/datum/feedback_variable/FV in feedback)
|
||||
+ if (sqlrowlist != "")
|
||||
+ sqlrowlist += ", " //a comma (,) at the start of the first row to insert will trigger a SQL error
|
||||
+
|
||||
+ sqlrowlist += "(null, Now(), [round_id], \"[sanitizeSQL(FV.get_variable())]\", [FV.get_value()], \"[sanitizeSQL(FV.get_details())]\")"
|
||||
+
|
||||
+ if (sqlrowlist == "")
|
||||
+ return
|
||||
+
|
||||
+ var/DBQuery/query_feedback_save = GLOB.dbcon.NewQuery("INSERT DELAYED IGNORE INTO [format_table_name("feedback")] VALUES " + sqlrowlist)
|
||||
+ query_feedback_save.Execute()
|
||||
+
|
||||
+/datum/controller/subsystem/blackbox/proc/LogBroadcast(blackbox_msg, freq)
|
||||
+ switch(freq)
|
||||
+ if(1459)
|
||||
+ msg_common += blackbox_msg
|
||||
+ if(1351)
|
||||
+ msg_science += blackbox_msg
|
||||
+ if(1353)
|
||||
+ msg_command += blackbox_msg
|
||||
+ if(1355)
|
||||
+ msg_medical += blackbox_msg
|
||||
+ if(1357)
|
||||
+ msg_engineering += blackbox_msg
|
||||
+ if(1359)
|
||||
+ msg_security += blackbox_msg
|
||||
+ if(1441)
|
||||
+ msg_deathsquad += blackbox_msg
|
||||
+ if(1213)
|
||||
+ msg_syndicate += blackbox_msg
|
||||
+ if(1349)
|
||||
+ msg_service += blackbox_msg
|
||||
+ if(1347)
|
||||
+ msg_cargo += blackbox_msg
|
||||
+ else
|
||||
+ msg_other += blackbox_msg
|
||||
+
|
||||
+/datum/controller/subsystem/blackbox/proc/find_feedback_datum(variable)
|
||||
+ for(var/datum/feedback_variable/FV in feedback)
|
||||
+ if(FV.get_variable() == variable)
|
||||
+ return FV
|
||||
+
|
||||
+ var/datum/feedback_variable/FV = new(variable)
|
||||
+ feedback += FV
|
||||
+ return FV
|
||||
+
|
||||
+/datum/controller/subsystem/blackbox/proc/set_val(variable, value)
|
||||
+ var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
||||
+ FV.set_value(value)
|
||||
+
|
||||
+/datum/controller/subsystem/blackbox/proc/inc(variable, value)
|
||||
+ var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
||||
+ FV.inc(value)
|
||||
+
|
||||
+/datum/controller/subsystem/blackbox/proc/dec(variable,value)
|
||||
+ var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
||||
+ FV.dec(value)
|
||||
+
|
||||
+/datum/controller/subsystem/blackbox/proc/set_details(variable,details)
|
||||
+ var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
||||
+ FV.set_details(details)
|
||||
+
|
||||
+/datum/controller/subsystem/blackbox/proc/add_details(variable,details)
|
||||
+ var/datum/feedback_variable/FV = find_feedback_datum(variable)
|
||||
+ FV.add_details(details)
|
||||
+
|
||||
+/datum/controller/subsystem/blackbox/proc/ReportDeath(mob/living/L)
|
||||
+ if(!GLOB.dbcon.Connect())
|
||||
+ return
|
||||
+ if(!L || !L.key || !L.mind)
|
||||
+ return
|
||||
+ var/turf/T = get_turf(L)
|
||||
+ var/area/placeofdeath = get_area(T.loc)
|
||||
+ var/sqlname = sanitizeSQL(L.real_name)
|
||||
+ var/sqlkey = sanitizeSQL(L.ckey)
|
||||
+ var/sqljob = sanitizeSQL(L.mind.assigned_role)
|
||||
+ var/sqlspecial = sanitizeSQL(L.mind.special_role)
|
||||
+ var/sqlpod = sanitizeSQL(placeofdeath.name)
|
||||
+ var/laname
|
||||
+ var/lakey
|
||||
+ if(L.lastattacker && ismob(L.lastattacker))
|
||||
+ var/mob/LA = L.lastattacker
|
||||
+ laname = sanitizeSQL(LA.real_name)
|
||||
+ lakey = sanitizeSQL(LA.key)
|
||||
+ var/sqlgender = sanitizeSQL(L.gender)
|
||||
+ var/sqlbrute = sanitizeSQL(L.getBruteLoss())
|
||||
+ var/sqlfire = sanitizeSQL(L.getFireLoss())
|
||||
+ var/sqlbrain = sanitizeSQL(L.getBrainLoss())
|
||||
+ var/sqloxy = sanitizeSQL(L.getOxyLoss())
|
||||
+ var/sqltox = sanitizeSQL(L.getStaminaLoss())
|
||||
+ var/sqlclone = sanitizeSQL(L.getStaminaLoss())
|
||||
+ var/sqlstamina = sanitizeSQL(L.getStaminaLoss())
|
||||
+ var/coord = sanitizeSQL("[L.x], [L.y], [L.z]")
|
||||
+ var/map = sanitizeSQL(SSmapping.config.map_name)
|
||||
+ var/DBQuery/query_report_death = GLOB.dbcon.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', INET_ATON('[world.internet_address]'), '[world.port]')")
|
||||
+ query_report_death.Execute()
|
||||
+
|
||||
+
|
||||
+//feedback variable datum, for storing all kinds of data
|
||||
+/datum/feedback_variable
|
||||
+ var/variable
|
||||
+ var/value
|
||||
+ var/details
|
||||
+
|
||||
+/datum/feedback_variable/New(param_variable, param_value = 0)
|
||||
+ variable = param_variable
|
||||
+ value = param_value
|
||||
+
|
||||
+/datum/feedback_variable/proc/inc(num = 1)
|
||||
+ if (isnum(value))
|
||||
+ value += num
|
||||
+ else
|
||||
+ value = text2num(value)
|
||||
+ if (isnum(value))
|
||||
+ value += num
|
||||
+ else
|
||||
+ value = num
|
||||
+
|
||||
+/datum/feedback_variable/proc/dec(num = 1)
|
||||
+ if (isnum(value))
|
||||
+ value -= num
|
||||
+ else
|
||||
+ value = text2num(value)
|
||||
+ if (isnum(value))
|
||||
+ value -= num
|
||||
+ else
|
||||
+ value = -num
|
||||
+
|
||||
+/datum/feedback_variable/proc/set_value(num)
|
||||
+ if (isnum(num))
|
||||
+ value = num
|
||||
+
|
||||
+/datum/feedback_variable/proc/get_value()
|
||||
+ if (!isnum(value))
|
||||
+ return 0
|
||||
+ return value
|
||||
+
|
||||
+/datum/feedback_variable/proc/get_variable()
|
||||
+ return variable
|
||||
+
|
||||
+/datum/feedback_variable/proc/set_details(text)
|
||||
+ if (istext(text))
|
||||
+ details = text
|
||||
+
|
||||
+/datum/feedback_variable/proc/add_details(text)
|
||||
+ if (istext(text))
|
||||
+ text = replacetext(text, " ", "_")
|
||||
+ if (!details)
|
||||
+ details = text
|
||||
+ else
|
||||
+ details += " [text]"
|
||||
+
|
||||
+/datum/feedback_variable/proc/get_details()
|
||||
+ return details
|
||||
+
|
||||
+/datum/feedback_variable/proc/get_parsed()
|
||||
+ return list(variable,value,details)
|
||||
@@ -483,7 +483,7 @@ SUBSYSTEM_DEF(job)
|
||||
else level4++ //not selected
|
||||
|
||||
tmp_str += "HIGH=[level1]|MEDIUM=[level2]|LOW=[level3]|NEVER=[level4]|BANNED=[level5]|YOUNG=[level6]|-"
|
||||
feedback_add_details("job_preferences",tmp_str)
|
||||
SSblackbox.add_details("job_preferences",tmp_str)
|
||||
|
||||
/datum/controller/subsystem/job/proc/PopcapReached()
|
||||
if(config.hard_popcap || config.extreme_popcap)
|
||||
|
||||
@@ -116,7 +116,7 @@ SUBSYSTEM_DEF(mapping)
|
||||
INIT_ANNOUNCE("Loading [config.map_name]...")
|
||||
TryLoadZ(config.GetFullMapPath(), FailedZs, ZLEVEL_STATION)
|
||||
INIT_ANNOUNCE("Loaded station in [(REALTIMEOFDAY - start_time)/10]s!")
|
||||
feedback_add_details("map_name", config.map_name)
|
||||
SSblackbox.add_details("map_name", config.map_name)
|
||||
|
||||
if(config.minetype != "lavaland")
|
||||
INIT_ANNOUNCE("WARNING: A map without lavaland set as it's minetype was loaded! This is being ignored! Update the maploader code!")
|
||||
|
||||
@@ -3,14 +3,20 @@
|
||||
SUBSYSTEM_DEF(ping)
|
||||
name = "Ping"
|
||||
wait = 6
|
||||
flags = SS_NO_INIT|SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY
|
||||
flags = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY
|
||||
priority = 10
|
||||
var/list/currentrun
|
||||
|
||||
/datum/controller/subsystem/ping/Initialize()
|
||||
if (config.hub)
|
||||
world.visibility = 1
|
||||
..()
|
||||
|
||||
/datum/controller/subsystem/ping/fire(resumed = FALSE)
|
||||
if (!resumed)
|
||||
src.currentrun = GLOB.clients.Copy()
|
||||
|
||||
var/round_started = Master.round_started
|
||||
var/list/currentrun = src.currentrun
|
||||
while (length(currentrun))
|
||||
var/client/C = currentrun[currentrun.len]
|
||||
@@ -19,7 +25,15 @@ SUBSYSTEM_DEF(ping)
|
||||
if (MC_TICK_CHECK)
|
||||
return
|
||||
continue
|
||||
|
||||
if(round_started && C.is_afk(INACTIVITY_KICK))
|
||||
if(!istype(C.mob, /mob/dead))
|
||||
log_access("AFK: [key_name(C)]")
|
||||
to_chat(C, "<span class='danger'>You have been inactive for more than 10 minutes and have been disconnected.</span>")
|
||||
qdel(C)
|
||||
|
||||
winset(C, null, "command=.update_ping+[world.time+world.tick_lag*world.tick_usage/100]")
|
||||
|
||||
if (MC_TICK_CHECK) //one day, when ss13 has 1000 people per server, you guys are gonna be glad I added this tick check
|
||||
return
|
||||
|
||||
|
||||
@@ -1,23 +1,38 @@
|
||||
#define PING_BUFFER_TIME 25
|
||||
|
||||
SUBSYSTEM_DEF(server_maint)
|
||||
name = "Server Tasks"
|
||||
wait = 6000
|
||||
flags = SS_NO_TICK_CHECK
|
||||
wait = 6
|
||||
flags = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY
|
||||
priority = 10
|
||||
var/list/currentrun
|
||||
|
||||
/datum/controller/subsystem/server_maint/Initialize(timeofday)
|
||||
if (config.hub)
|
||||
world.visibility = 1
|
||||
..()
|
||||
|
||||
/datum/controller/subsystem/server_maint/fire()
|
||||
//handle kicking inactive players
|
||||
if(config.kick_inactive)
|
||||
for(var/client/C in GLOB.clients)
|
||||
if(C.is_afk(config.afk_period))
|
||||
var/cmob = C.mob
|
||||
if(!(istype(cmob, /mob/dead/observer) || (istype(cmob, /mob/dead) && C.holder)))
|
||||
/datum/controller/subsystem/server_maint/fire(resumed = FALSE)
|
||||
if (!resumed)
|
||||
src.currentrun = GLOB.clients.Copy()
|
||||
|
||||
var/round_started = Master.round_started
|
||||
var/list/currentrun = src.currentrun
|
||||
while (length(currentrun))
|
||||
var/client/C = currentrun[currentrun.len]
|
||||
currentrun.len--
|
||||
|
||||
if(config.kick_inactive)
|
||||
if(round_started && C.is_afk(INACTIVITY_KICK))
|
||||
if(!istype(C.mob, /mob/dead))
|
||||
log_access("AFK: [key_name(C)]")
|
||||
to_chat(C, "<span class='danger'>You have been inactive for more than [config.afk_period / 600] minutes and have been disconnected.</span>")
|
||||
to_chat(C, "<span class='danger'>You have been inactive for more than 10 minutes and have been disconnected.</span>")
|
||||
qdel(C)
|
||||
|
||||
if(config.sql_enabled)
|
||||
sql_poll_population()
|
||||
if (!(!C || world.time - C.connection_time < PING_BUFFER_TIME || C.inactivity >= (wait-1)))
|
||||
winset(C, null, "command=.update_ping+[world.time+world.tick_lag*world.tick_usage/100]")
|
||||
|
||||
if (MC_TICK_CHECK) //one day, when ss13 has 1000 people per server, you guys are gonna be glad I added this tick check
|
||||
return
|
||||
|
||||
#undef PING_BUFFER_TIME
|
||||
|
||||
7
code/controllers/subsystem/server_maint.dm.rej
Normal file
7
code/controllers/subsystem/server_maint.dm.rej
Normal file
@@ -0,0 +1,7 @@
|
||||
diff a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm (rejected hunks)
|
||||
@@ -18,5 +18,3 @@ SUBSYSTEM_DEF(server_maint)
|
||||
to_chat(C, "<span class='danger'>You have been inactive for more than 10 minutes and have been disconnected.</span>")
|
||||
qdel(C)
|
||||
|
||||
- if(config.sql_enabled)
|
||||
- sql_poll_population()
|
||||
Reference in New Issue
Block a user