cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Configuration Controller (#7857)

Browse Source
This commit is contained in:
Selis
2024-04-05 07:44:20 +02:00
committed by GitHub
parent c542e3bac0
commit e1a987c25c
235 changed files with 3294 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/dbcore.dm
+14 -12
View File
@@ -203,18 +203,19 @@ SUBSYSTEM_DEF(dbcore)
failed_connection_timeout = world.time + 50
return FALSE
if(!config.sql_enabled)
if(!CONFIG_GET(flag/sql_enabled))
return FALSE
//start_db_daemon()
var/user = sqlfdbklogin
var/pass = sqlfdbkpass
var/db = sqlfdbkdb
var/address = sqladdress
var/port = text2num(sqlport)
var/timeout = 10
var/thread_limit = 50
var/user = CONFIG_GET(string/feedback_login)
var/pass = CONFIG_GET(string/feedback_password)
var/db = CONFIG_GET(string/feedback_database)
var/address = CONFIG_GET(string/address)
var/port = CONFIG_GET(number/port)
var/timeout = max(CONFIG_GET(number/async_query_timeout), CONFIG_GET(number/blocking_query_timeout))
var/min_sql_connections = CONFIG_GET(number/pooling_min_sql_connections)
var/max_sql_connections = CONFIG_GET(number/pooling_max_sql_connections)
var/result = json_decode(rustg_sql_connect_pool(json_encode(list(
"host" = address,
@@ -224,7 +225,8 @@ SUBSYSTEM_DEF(dbcore)
"db_name" = db,
"read_timeout" = timeout,
"write_timeout" = timeout,
"max_threads" = thread_limit,
"min_threads" = min_sql_connections,
"max_threads" = max_sql_connections,
))))
. = (result["status"] == "ok")
if (.)
@@ -236,7 +238,7 @@ SUBSYSTEM_DEF(dbcore)
++failed_connections
/datum/controller/subsystem/dbcore/proc/CheckSchemaVersion()
if(config.sql_enabled)
if(CONFIG_GET(flag/sql_enabled))
if(Connect())
log_world("Database connection established.")
else
@@ -283,14 +285,14 @@ SUBSYSTEM_DEF(dbcore)
connection = null
/datum/controller/subsystem/dbcore/proc/IsConnected()
if (!config.sql_enabled)
if (!CONFIG_GET(flag/sql_enabled))
return FALSE
if (!connection)
return FALSE
return json_decode(rustg_sql_connected(connection))["status"] == "online"
/datum/controller/subsystem/dbcore/proc/ErrorMsg()
if(!config.sql_enabled)
if(!CONFIG_GET(flag/sql_enabled))
return "Database disabled by configuration"
return last_error