diff options
| author |  brain | 2005-04-26 00:58:31 +0000 |
|---|---|---|
| committer | brain | 2005-04-26 00:58:31 +0000 |
| commit | b6f5d703b010fa5e4cd1d082ea70fe0cc27fb9e9 (patch) | |
| tree | a4968276af8ce4ab6d5281af8355cbab96b67934 /src/modules/extra/m_sql.cpp | |
| parent | Fixed include issue (diff) | |
Major code tidyup (-W) - expect a few belches
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1190 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/extra/m_sql.cpp')
| -rw-r--r-- | src/modules/extra/m_sql.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/modules/extra/m_sql.cpp b/src/modules/extra/m_sql.cpp index 45421e334..dd0cbdc1d 100644 --- a/src/modules/extra/m_sql.cpp +++ b/src/modules/extra/m_sql.cpp @@ -56,7 +56,9 @@ class SQLConnection this->pass = thispass; this->db = thisdb; this->id = myid; + unsigned int timeout = 1; mysql_init(&connection); + mysql_options(&connection,MYSQL_OPT_CONNECT_TIMEOUT,(char*)&timeout); } // This method connects to the database using the credentials supplied to the constructor, and returns @@ -187,18 +189,18 @@ class ModuleSQL : public Module } } - void LoadDatabases(ConfigReader* Conf) + void LoadDatabases(ConfigReader* ThisConf) { Srv->Log(DEFAULT,"SQL: Loading database settings"); Connections.clear(); Srv->Log(DEBUG,"Cleared connections"); - for (int j =0; j < Conf->Enumerate("database"); j++) + for (int j =0; j < ThisConf->Enumerate("database"); j++) { - std::string db = Conf->ReadValue("database","name",j); - std::string user = Conf->ReadValue("database","username",j); - std::string pass = Conf->ReadValue("database","password",j); - std::string host = Conf->ReadValue("database","hostname",j); - std::string id = Conf->ReadValue("database","id",j); + std::string db = ThisConf->ReadValue("database","name",j); + std::string user = ThisConf->ReadValue("database","username",j); + std::string pass = ThisConf->ReadValue("database","password",j); + std::string host = ThisConf->ReadValue("database","hostname",j); + std::string id = ThisConf->ReadValue("database","id",j); Srv->Log(DEBUG,"Read database settings"); if ((db != "") && (host != "") && (user != "") && (id != "") && (pass != "")) { |