m_spanningtree Remove unneeded #includes

[user/henk/code/inspircd.git] / src / modules / extra / m_mssql.cpp

diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp
index eca646fcfb8d2e1620fadf8198a7576cf51868d8..f9c3ea5906f5b7d49046f76def519f506b68cc50 100644 (file)
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -88,10 +88,6 @@ class MsSQLResult : public SQLresult
        {
        }
 
-       ~MsSQLResult()
-       {
-       }
-
        void AddRow(int colsnum, char **dat, char **colname)
        {
                colnames.clear();
@@ -258,7 +254,7 @@ class SQLConn : public classbase
                                if (tds_process_simple_query(sock) != TDS_SUCCEED)
                                {
                                        LoggingMutex->Lock();
-                                       ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
+                                       ServerInstance->Logs->Log("m_mssql",LOG_DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
                                        LoggingMutex->Unlock();
                                        CloseDB();
                                }
@@ -266,7 +262,7 @@ class SQLConn : public classbase
                        else
                        {
                                LoggingMutex->Lock();
-                               ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
+                               ServerInstance->Logs->Log("m_mssql",LOG_DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
                                LoggingMutex->Unlock();
                                CloseDB();
                        }
@@ -274,7 +270,7 @@ class SQLConn : public classbase
                else
                {
                        LoggingMutex->Lock();
-                       ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not connect to DB with id: " + host.id);
+                       ServerInstance->Logs->Log("m_mssql",LOG_DEFAULT, "WARNING: Could not connect to DB with id: " + host.id);
                        LoggingMutex->Unlock();
                        CloseDB();
                }
@@ -433,7 +429,7 @@ class SQLConn : public classbase
 
                char* msquery = strdup(req->query.q.data());
                LoggingMutex->Lock();
-               ServerInstance->Logs->Log("m_mssql",DEBUG,"doing Query: %s",msquery);
+               ServerInstance->Logs->Log("m_mssql",LOG_DEBUG,"doing Query: %s",msquery);
                LoggingMutex->Unlock();
                if (tds_submit_query(sock, msquery) != TDS_SUCCEED)
                {
@@ -449,8 +445,8 @@ class SQLConn : public classbase
                int tds_res;
                while (tds_process_tokens(sock, &tds_res, NULL, TDS_TOKEN_RESULTS) == TDS_SUCCEED)
                {
-                       //ServerInstance->Logs->Log("m_mssql",DEBUG,"<******> result type: %d", tds_res);
-                       //ServerInstance->Logs->Log("m_mssql",DEBUG,"AFFECTED ROWS: %d", sock->rows_affected);
+                       //ServerInstance->Logs->Log("m_mssql",LOG_DEBUG,"<******> result type: %d", tds_res);
+                       //ServerInstance->Logs->Log("m_mssql",LOG_DEBUG,"AFFECTED ROWS: %d", sock->rows_affected);
                        switch (tds_res)
                        {
                                case TDS_ROWFMT_RESULT:
@@ -516,7 +512,7 @@ class SQLConn : public classbase
        {
                SQLConn* sc = (SQLConn*)pContext->parent;
                LoggingMutex->Lock();
-               ServerInstance->Logs->Log("m_mssql", DEBUG, "Message for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
+               ServerInstance->Logs->Log("m_mssql", LOG_DEBUG, "Message for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
                LoggingMutex->Unlock();
                return 0;
        }
@@ -525,7 +521,7 @@ class SQLConn : public classbase
        {
                SQLConn* sc = (SQLConn*)pContext->parent;
                LoggingMutex->Lock();
-               ServerInstance->Logs->Log("m_mssql", DEFAULT, "Error for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
+               ServerInstance->Logs->Log("m_mssql", LOG_DEFAULT, "Error for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
                LoggingMutex->Unlock();
                return 0;
        }
@@ -664,7 +660,7 @@ class ModuleMsSQL : public Module
                ServerInstance->Threads->Start(queryDispatcher);
 
                Implementation eventlist[] = { I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                ServerInstance->Modules->AddService(sqlserv);
        }
 
@@ -707,16 +703,17 @@ class ModuleMsSQL : public Module
 
        bool HostInConf(const SQLhost &h)
        {
-               ConfigReader conf;
-               for(int i = 0; i < conf.Enumerate("database"); i++)
+               ConfigTagList tags = ServerInstance->Config->ConfTags("database");
+               for (ConfigIter i = tags.first; i != tags.second; ++i)
                {
+                       ConfigTag* tag = i->second;
                        SQLhost host;
-                       host.id         = conf.ReadValue("database", "id", i);
-                       host.host       = conf.ReadValue("database", "hostname", i);
-                       host.port       = conf.ReadInteger("database", "port", "1433", i, true);
-                       host.name       = conf.ReadValue("database", "name", i);
-                       host.user       = conf.ReadValue("database", "username", i);
-                       host.pass       = conf.ReadValue("database", "password", i);
+                       host.id         = tag->getString("id");
+                       host.host       = tag->getString("hostname");
+                       host.port       = tag->getInt("port", 1433);
+                       host.name       = tag->getString("name");
+                       host.user       = tag->getString("username");
+                       host.pass       = tag->getString("password");
                        if (h == host)
                                return true;
                }
@@ -727,17 +724,18 @@ class ModuleMsSQL : public Module
        {
                ClearOldConnections();
 
-               ConfigReader conf;
-               for(int i = 0; i < conf.Enumerate("database"); i++)
+               ConfigTagList tags = ServerInstance->Config->ConfTags("database");
+               for (ConfigIter i = tags.first; i != tags.second; ++i)
                {
+                       ConfigTag* tag = i->second;
                        SQLhost host;
 
-                       host.id         = conf.ReadValue("database", "id", i);
-                       host.host       = conf.ReadValue("database", "hostname", i);
-                       host.port       = conf.ReadInteger("database", "port", "1433", i, true);
-                       host.name       = conf.ReadValue("database", "name", i);
-                       host.user       = conf.ReadValue("database", "username", i);
-                       host.pass       = conf.ReadValue("database", "password", i);
+                       host.id         = tag->getString("id");
+                       host.host       = tag->getString("hostname");
+                       host.port       = tag->getInt("port", 1433);
+                       host.name       = tag->getString("name");
+                       host.user       = tag->getString("username");
+                       host.pass       = tag->getString("password");
 
                        if (HasHost(host))
                                continue;
@@ -751,7 +749,7 @@ class ModuleMsSQL : public Module
                if (HasHost(hi))
                {
                        LoggingMutex->Lock();
-                       ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: A MsSQL connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str());
+                       ServerInstance->Logs->Log("m_mssql",LOG_DEFAULT, "WARNING: A MsSQL connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str());
                        LoggingMutex->Unlock();
                        return;
                }