Fix openssl.

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

diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index 401db811c8623a8a3f53491ddcaaf56f2f24f449..391e4bbba4ffb6a82081c504e7c8995b0fc50300 100644 (file)
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -11,14 +11,13 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "configreader.h"
-#include "inspircd.h"
 #include "m_sqlv2.h"
 
-
 static Module* SQLModule;
 static Module* MyMod;
 static std::string dbid;
@@ -178,12 +177,11 @@ public:
 
 class ModuleSQLLog : public Module
 {
-       InspIRCd* Srv;
        ConfigReader* Conf;
 
  public:
        ModuleSQLLog(InspIRCd* Me)
-       : Module::Module(Me), Srv(Me)
+       : Module::Module(Me)
        {
                ServerInstance->UseInterface("SQLutils");
                ServerInstance->UseInterface("SQL");
@@ -192,9 +190,9 @@ class ModuleSQLLog : public Module
                if (!SQLutils)
                        throw ModuleException("Can't find m_sqlutils.so. Please load m_sqlutils.so before m_sqlauth.so.");
 
-               SQLModule = Srv->FindFeature("SQL");
+               SQLModule = ServerInstance->FindFeature("SQL");
 
-               OnRehash("");
+               OnRehash(NULL,"");
                MyMod = this;
                active_queries.clear();
        }
@@ -214,11 +212,11 @@ class ModuleSQLLog : public Module
 
        void ReadConfig()
        {
-               ConfigReader Conf(Srv);
+               ConfigReader Conf(ServerInstance);
                dbid = Conf.ReadValue("sqllog","dbid",0);       // database id of a database configured in sql module
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                ReadConfig();
        }
@@ -231,15 +229,11 @@ class ModuleSQLLog : public Module
                        std::map<unsigned long, QueryInfo*>::iterator n;
 
                        res = static_cast<SQLresult*>(request);
-                       ServerInstance->Log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetId(), res->id);
-
                        n = active_queries.find(res->id);
 
                        if (n != active_queries.end())
                        {
-                               ServerInstance->Log(DEBUG,"This is an active query");
                                n->second->Go(res);
-
                                std::map<unsigned long, QueryInfo*>::iterator n = active_queries.find(res->id);
                                active_queries.erase(n);
                        }
@@ -247,8 +241,6 @@ class ModuleSQLLog : public Module
                        return SQLSUCCESS;
                }
 
-               ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId());
-
                return NULL;
        }
 
@@ -264,11 +256,6 @@ class ModuleSQLLog : public Module
                        QueryInfo* i = new QueryInfo(nick, source, host, req.id, category);
                        i->qs = FIND_SOURCE;
                        active_queries[req.id] = i;
-                       ServerInstance->Log(DEBUG,"Active query id %d",req.id);
-               }
-               else
-               {
-                       ServerInstance->Log(DEBUG, "SQLrequest failed: %s", req.error.Str());
                }
        }
 
@@ -302,14 +289,14 @@ class ModuleSQLLog : public Module
                AddLogEntry(LT_CONNECT,user->nick,user->host,user->server);
        }
 
-       virtual void OnUserQuit(userrec* user, const std::string &reason)
+       virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
        {
                AddLogEntry(LT_DISCONNECT,user->nick,user->host,user->server);
        }
 
        virtual void OnLoadModule(Module* mod, const std::string &name)
        {
-               AddLogEntry(LT_LOADMODULE,name,Srv->Config->ServerName, Srv->Config->ServerName);
+               AddLogEntry(LT_LOADMODULE,name,ServerInstance->Config->ServerName, ServerInstance->Config->ServerName);
        }
 
        virtual Version GetVersion()
@@ -319,26 +306,5 @@ class ModuleSQLLog : public Module
        
 };
 
-class ModuleSQLLogFactory : public ModuleFactory
-{
- public:
-       ModuleSQLLogFactory()
-       {
-       }
-       
-       ~ModuleSQLLogFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSQLLog(Me);
-       }
-       
-};
-
+MODULE_INIT(ModuleSQLLog);
 
-extern "C" void * init_module( void )
-{
-       return new ModuleSQLLogFactory;
-}