Mysql: Establish a default timeout

This commit is contained in:
Arkshine 2015-01-29 13:50:13 +01:00
parent 5ca0e5617d
commit f8ec7f94a4
5 changed files with 41 additions and 20 deletions

View File

@ -15,6 +15,9 @@ amxx_vault addons/amxmodx/data/vault.ini
; 3 - HL Logs
amxx_logging 1
; MySQL default timeout
mysql_timeout 60
; Binary logging level
; add these up to get what you want
; these only work with bin logging binaries

View File

@ -12,3 +12,4 @@ amx_sql_pass ""
amx_sql_db "amx"
amx_sql_table "admins"
amx_sql_type "mysql"
amx_sql_timeout "60"

View File

@ -52,11 +52,22 @@ IDatabase *MysqlDriver::_Connect(DatabaseInfo *info, int *errcode, char *error,
return NULL;
}
if (do_timeout && info->max_timeout)
decltype(info->max_timeout) timeout = atoi(LOCALINFO("mysql_timeout"));
if (timeout <= 0)
{
mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&(info->max_timeout));
timeout = 60;
}
if (do_timeout && info->max_timeout > 0)
{
timeout = info->max_timeout;
}
mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&timeout);
mysql_options(mysql, MYSQL_OPT_READ_TIMEOUT, (const char *)&timeout);
mysql_options(mysql, MYSQL_OPT_WRITE_TIMEOUT, (const char *)&timeout);
/** Have MySQL automatically reconnect if it times out or loses connection.
* This will prevent "MySQL server has gone away" errors after a while.
*/

View File

@ -73,6 +73,7 @@ public plugin_init()
register_cvar("amx_sql_pass", "", FCVAR_PROTECTED)
register_cvar("amx_sql_db", "amx", FCVAR_PROTECTED)
register_cvar("amx_sql_type", "mysql", FCVAR_PROTECTED)
register_cvar("amx_sql_timeout", "60", FCVAR_PROTECTED)
register_concmd("amx_reloadadmins", "cmdReload", ADMIN_CFG)
register_concmd("amx_addadmin", "addadminfn", ADMIN_RCON, "<playername|auth> <accessflags> [password] [authtype] - add specified player as an admin to users.ini")

View File

@ -394,6 +394,11 @@ stock Handle:SQL_MakeStdTuple(timeout = 0)
get_cvar_string("amx_sql_type", set_type, 11);
get_cvar_string("amx_sql_db", db, 127);
if (timeout <= 0)
{
timeout = get_cvar_num("amx_sql_timeout");
}
SQL_GetAffinity(get_type, 12);
if (!equali(get_type, set_type))