Attach to events and register services in init()

[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 455a4fa47cdaba4209c04c50235b29c66b189895..27410e95be0ac2fdd1f1941bc4d4b22a3ed96541 100644 (file)
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -1,16 +1,26 @@
-/*              +------------------------------------+
- *              | Inspire Internet Relay Chat Daemon |
- *              +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *     InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2008-2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008-2009 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
  *
- * This program is free but copyrighted software; see
- *                       the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include <tds.h>
 #include <tdsconvert.h>
@@ -636,29 +646,26 @@ class ModuleMsSQL : public Module
  private:
        unsigned long currid;
        QueryThread* queryDispatcher;
+       ServiceProvider sqlserv;
 
  public:
        ModuleMsSQL()
-       : currid(0)
+       : currid(0), sqlserv(this, "SQL/mssql", SERVICE_DATA)
        {
                LoggingMutex = new Mutex();
                ResultsMutex = new Mutex();
+               queryDispatcher = new QueryThread(this);
+       }
 
-               ServerInstance->Modules->UseInterface("SQLutils");
-
-               if (!ServerInstance->Modules->PublishFeature("SQL", this))
-               {
-                       throw ModuleException("m_mssql: Unable to publish feature 'SQL'");
-               }
-
+       void init()
+       {
                ReadConf();
 
-               queryDispatcher = new QueryThread(this);
                ServerInstance->Threads->Start(queryDispatcher);
 
-               ServerInstance->Modules->PublishInterface("SQL", this);
                Implementation eventlist[] = { I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 1);
+               ServerInstance->Modules->AddService(sqlserv);
        }
 
        virtual ~ModuleMsSQL()
@@ -668,10 +675,6 @@ class ModuleMsSQL : public Module
                ClearQueue();
                ClearAllConnections();
 
-               ServerInstance->Modules->UnpublishInterface("SQL", this);
-               ServerInstance->Modules->UnpublishFeature("SQL");
-               ServerInstance->Modules->DoneWithInterface("SQLutils");
-
                delete LoggingMutex;
                delete ResultsMutex;
        }
@@ -704,16 +707,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;
                }
@@ -724,17 +728,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;
@@ -777,12 +782,9 @@ class ModuleMsSQL : public Module
 
        void ClearAllConnections()
        {
-               ConnMap::iterator i;
-               while ((i = connections.begin()) != connections.end())
-               {
-                       connections.erase(i);
+               for(ConnMap::iterator i = connections.begin(); i != connections.end(); ++i)
                        delete i->second;
-               }
+               connections.clear();
        }
 
        virtual void OnRehash(User* user)