Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #188 from Arkshine/feature/mysql-rw-and-default-timeout

Browse Source 
Establish a default timeout for MySQL connectivity
This commit is contained in:
Vincent Herbet
2015-01-30 15:56:40 +01:00
parent 7d084ee0bf 98d4031b5c
commit 6319331a33
5 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/mysqlx/mysql/MysqlDriver.cpp
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.
*/