Removal of Server::Log -- not much ever used it anyway with the ability to use log...

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4845 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/modules.h b/include/modules.h
index 78994e746d51094a55520e571317237bbc331e02..8baf31b4c498a6f47a39a659a57ab7520e9e39b4 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -1309,12 +1309,6 @@ class Server : public Extensible
 
        const std::string& GetModuleName(Module* m);
 
-       /** Writes a log string.
-        * This method writes a line of text to the log. If the level given is lower than the
-        * level given in the configuration, this command has no effect.
-        */
-       void Log(int level, const std::string &s);
-
        /** Returns true if a nick is valid.
         * Nicks for unregistered connections will return false.
         */

diff --git a/src/modules.cpp b/src/modules.cpp
index e8590bcc498779ffb88abc473807c2b54d18f604..ee18cb9a68b3ff1276e076e4e18203c418af2eaa 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -370,11 +370,6 @@ bool Server::IsValidModuleCommand(const std::string &commandname, int pcnt, user
        return ServerInstance->Parser->IsValidCommand(commandname, pcnt, user);
 }
 
-void Server::Log(int level, const std::string &s)
-{
-       log(level,"%s",s.c_str());
-}
-
 void Server::AddCommand(command_t *f)
 {
        if (!ServerInstance->Parser->CreateCommand(f))

diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index 891b550ffe6c3e9342dc47e8dd2eaaae09f15244..0f52c6aa4a5ac59ba513eda663282b4396506a6a 100644 (file)
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -71,7 +71,7 @@ class ModuleFilterPCRE : public Module
                        FilterPCREException e;
                        throw(e);
                }
-               Srv->Log(DEFAULT,std::string("m_filter_pcre: read configuration from ")+filterfile);
+               log(DEFAULT,"m_filter_pcre: read configuration from "+filterfile);
 
                filters.clear();
                for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
@@ -172,7 +172,7 @@ class ModuleFilterPCRE : public Module
                        // bail if the user forgot to create a config file
                        throw(e);
                }
-               Srv->Log(DEFAULT,std::string("m_filter_pcre: read configuration from ")+filterfile);
+               log(DEFAULT,"m_filter_pcre: read configuration from "+filterfile);
 
                filters.clear();
                for (int index = 0; index < MyConf->Enumerate("keyword"); index++)

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index eeb803d5a52db0381e16a700aa5933331ad1ab84..a6fa7ab8edfe6478d4ca6de3b8e8556cb77d322d 100644 (file)
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -603,11 +603,11 @@ void ConnectDatabases(Server* Srv)
                i->second->SetEnable(true);
                if (i->second->Connect())
                {
-                       Srv->Log(DEFAULT,"SQL: Successfully connected database "+i->second->GetHost());
+                       log(DEFAULT,"SQL: Successfully connected database "+i->second->GetHost());
                }
                else
                {
-                       Srv->Log(DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError());
+                       log(DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError());
                        i->second->SetEnable(false);
                }
        }
@@ -616,9 +616,9 @@ void ConnectDatabases(Server* Srv)
 
 void LoadDatabases(ConfigReader* ThisConf, Server* Srv)
 {
-       Srv->Log(DEFAULT,"SQL: Loading database settings");
+       log(DEFAULT,"SQL: Loading database settings");
        Connections.clear();
-       Srv->Log(DEBUG,"Cleared connections");
+       log(DEBUG,"Cleared connections");
        for (int j =0; j < ThisConf->Enumerate("database"); j++)
        {
                std::string db = ThisConf->ReadValue("database","name",j);
@@ -626,13 +626,13 @@ void LoadDatabases(ConfigReader* ThisConf, Server* Srv)
                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");
+               log(DEBUG,"Read database settings");
                if ((db != "") && (host != "") && (user != "") && (id != "") && (pass != ""))
                {
                        SQLConnection* ThisSQL = new SQLConnection(host,user,pass,db,id);
-                       Srv->Log(DEFAULT,"Loaded database: "+ThisSQL->GetHost());
+                       log(DEFAULT,"Loaded database: "+ThisSQL->GetHost());
                        Connections[id] = ThisSQL;
-                       Srv->Log(DEBUG,"Pushed back connection");
+                       log(DEBUG,"Pushed back connection");
                }
        }
        ConnectDatabases(Srv);

diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index 5fcc30cc4356837ce28fb837600b759454d198b9..a7d73af18b6121e2aa55164784c0df61ab0da26e 100644 (file)
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -281,7 +281,7 @@ class ModuleSQLLog : public Module
                DELETE(Conf);
                SQLModule = Srv->FindFeature("SQL");
                if (!SQLModule)
-                       Srv->Log(DEFAULT,"WARNING: m_sqllog.so could not initialize because an SQL module is not loaded. Load the module and rehash your server.");
+                       log(DEFAULT,"WARNING: m_sqllog.so could not initialize because an SQL module is not loaded. Load the module and rehash your server.");
                return (SQLModule);
        }
 

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 30ece8f60b3f85c58cd79317235d6d40f0f0877b..9bb92fd61c133c0da866e3882716ecac911295b4 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -369,9 +369,6 @@ class ModuleSSLGnuTLS : public Module
                                        // As above
                                        readresult = length;
                                }
-                       
-                               log(DEBUG, "m_ssl_gnutls.so: OnRawSocketRead: Passing %d bytes up to insp:", length);
-                               Srv->Log(DEBUG, std::string(buffer, readresult));
                        }
                }
                else if(session->status == ISSL_CLOSING)
@@ -421,10 +418,7 @@ class ModuleSSLGnuTLS : public Module
                count = session->outbuf.size();
 
                if(session->status == ISSL_HANDSHAKEN)
-               {
-                       log(DEBUG, "m_ssl_gnutls.so: OnRawSocketWrite: Trying to write %d bytes:", count);
-                       Srv->Log(DEBUG, session->outbuf);
-                       
+               {       
                        int ret = gnutls_record_send(session->sess, sendbuffer, count);
                
                        if(ret == 0)

diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index c0f02f322cb40b8845d468e5969e06aca46c11e9..f9f38fc1785f345ed1dffd6ac79f802acfaaa200 100644 (file)
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -367,9 +367,6 @@ class ModuleSSLOpenSSL : public Module
                                                session->inbufoffset = 0;
                                        }
                                
-                                       log(DEBUG, "m_ssl_openssl.so: OnRawSocketRead: Passing %d bytes up to insp:", count);
-                                       Srv->Log(DEBUG, std::string(buffer, readresult));
-                               
                                        return 1;
                                }
                                else
@@ -436,9 +433,6 @@ class ModuleSSLOpenSSL : public Module
        
        int DoWrite(issl_session* session)
        {
-               log(DEBUG, "m_ssl_openssl.so: DoWrite: Trying to write %d bytes:", session->outbuf.size());
-               Srv->Log(DEBUG, session->outbuf);
-                       
                int ret = SSL_write(session->sess, session->outbuf.data(), session->outbuf.size());
                
                if(ret == 0)

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index a530ea49bb2fd3e7e9894442298157928d236c62..bd549860f153cb606d56553c33be720154d5ea09 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -57,7 +57,6 @@ public:
                {
                        modelist* list;
                        chan->GetExt(be->GetInfoKey(), list);
-                       Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for ban exceptions");
                        
                        if(list)
                        {

diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 41b78f98bfae7db352c43b953c77c9878ae55478..21c3ee68171e045487018e6acf5f7030233d8f83 100644 (file)
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -323,7 +323,7 @@ class ModuleChanProtect : public Module
                                user->WriteServ("MODE %s +q %s",channel->name,user->nick);
                                if (user->Extend("cm_founder_"+std::string(channel->name),fakevalue))
                                {
-                                       Srv->Log(DEBUG,"Marked user "+std::string(user->nick)+" as founder for "+std::string(channel->name));
+                                       log(DEBUG,"Marked user "+std::string(user->nick)+" as founder for "+std::string(channel->name));
                                }
                        }
                }

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 5a0e28bb5e94958432591e9d6d9aff7879a5fda8..92fac501e98519019e8083e12644e5911f22014c 100644 (file)
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -348,7 +348,7 @@ class CloakUser : public ModeHandler
                                                // else, they have an ip
                                                b = std::string(ra) + "." + prefix + ".cloak";
                                        }
-                                       Srv->Log(DEBUG,"cloak: allocated "+b);
+                                       log(DEBUG,"cloak: allocated "+b);
                                        dest->ChangeDisplayedHost(b.c_str());
                                }
                                

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 13e68f943157f6e700414f12f69c3afd88afec31..6b0efe5ccba2386ef717957de8c57b559b0745c4 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -110,9 +110,7 @@ class ModuleFilter : public Module
                                        ServerInstance->WriteOpers(std::string("FILTER: ")+user->nick+" had their notice filtered, target was "+target+": "+f->reason);
                                        user->WriteServ("NOTICE "+std::string(user->nick)+" :Your notice has been filtered and opers notified: "+f->reason);
                                }
-                               Srv->Log(DEFAULT,std::string("FILTER: ")+std::string(user->nick)+
-                                               std::string(" had their notice filtered, target was ")+
-                                               target+": "+f->reason+" Action: "+f->action);
+                               log(DEFAULT,"FILTER: "+std::string(user->nick)+std::string(" had their notice filtered, target was ")+target+": "+f->reason+" Action: "+f->action);
 
                                if (f->action == "kill")
                                {
@@ -155,7 +153,7 @@ class ModuleFilter : public Module
                        x->action = do_action;
                        filters[pattern] = x;
                }
-               Srv->Log(DEFAULT,std::string("m_filter: read configuration from ")+filterfile);
+               log(DEFAULT,"m_filter: read configuration from "+filterfile);
                DELETE(Conf);
                DELETE(MyConf);
        }

diff --git a/src/modules/m_foobar.cpp b/src/modules/m_foobar.cpp
index 6db01bc036c285cac8f6d729dd73e39c2162477b..93b1848fed8d820279a5b7ee665aa94120065ed1 100644 (file)
--- a/src/modules/m_foobar.cpp
+++ b/src/modules/m_foobar.cpp
@@ -20,6 +20,7 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: A dummy module for testing */
 
@@ -67,7 +68,7 @@ class ModuleFoobar : public Module
                // method called when a user connects
        
                std::string b = user->nick;
-               Srv->Log(DEBUG,"Foobar: User connecting: " + b);
+               log(DEBUG,"Foobar: User connecting: "+b);
        }
 
        virtual void OnUserQuit(userrec* user, const std::string &reason)
@@ -75,7 +76,7 @@ class ModuleFoobar : public Module
                // method called when a user disconnects
        
                std::string b = user->nick;
-               Srv->Log(DEBUG,"Foobar: User quitting: " + b);
+               log(DEBUG,"Foobar: User quitting: "+b);
        }
        
        virtual void OnUserJoin(userrec* user, chanrec* channel)
@@ -84,7 +85,7 @@ class ModuleFoobar : public Module
        
                std::string c = channel->name;
                std::string b = user->nick;
-               Srv->Log(DEBUG,"Foobar: User " + b + " joined " + c);
+               log(DEBUG,"Foobar: User "+b+" joined "+c);
        }
 
        virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partreason)
@@ -93,7 +94,7 @@ class ModuleFoobar : public Module
        
                std::string c = channel->name;
                std::string b = user->nick;
-               Srv->Log(DEBUG,"Foobar: User " + b + " parted " + c);
+               log(DEBUG,"Foobar: User "+b+" parted "+c);
        }
 
 };

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index d40bf045b171fefe5e5f629ef17754b8343bf027..3d924bb0f5b6f4dd0a1bdc2584607d09e14042c0 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -47,7 +47,7 @@ class RFC1413 : public InspSocket
 
        RFC1413(InspIRCd* SI, userrec* user, int maxtime, Server* S) : InspSocket(SI, user->GetIPString(), 113, false, maxtime), Srv(S), u(user), ufd(user->fd)
        {
-               Srv->Log(DEBUG,"Ident: associated.");
+               log(DEBUG,"Ident: associated.");
        }
 
        virtual void OnTimeout()
@@ -88,7 +88,7 @@ class RFC1413 : public InspSocket
                                                                if (u && (fd_ref_table[ufd] == u))
                                                                {
                                                                        strlcpy(u->ident,section,IDENTMAX);
-                                                                       Srv->Log(DEBUG,"IDENT SET: "+std::string(u->ident));
+                                                                       log(DEBUG,"IDENT SET: "+std::string(u->ident));
                                                                        u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Found your ident: "+std::string(u->ident));
                                                                }
                                                        }
@@ -145,7 +145,7 @@ class RFC1413 : public InspSocket
                        themlen = sizeof(sock_them);
                        if ((getsockname(this->u->fd,(sockaddr*)&sock_us,&uslen) || getpeername(this->u->fd, (sockaddr*)&sock_them, &themlen)))
                        {
-                               Srv->Log(DEBUG,"Ident: failed to get socket names, bailing");
+                               log(DEBUG,"Ident: failed to get socket names, bailing");
                                return false;
                        }
                        else
@@ -157,7 +157,7 @@ class RFC1413 : public InspSocket
                                snprintf(ident_request,127,"%d,%d\r\n",ntohs(sock_them.sin_port),ntohs(sock_us.sin_port));
 #endif
                                this->Write(ident_request);
-                               Srv->Log(DEBUG,"Sent ident request, waiting for reply");
+                               log(DEBUG,"Sent ident request, waiting for reply");
                                return true;
                        }
                }

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 5cfee76da092c02605a88e3f19c597b180bc4e5c..dabdc2829972411082e32b262014ed8fd0dd20ca 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -56,7 +56,6 @@ public:
                {
                        modelist* list;
                        chan->GetExt(ie->GetInfoKey(), list);
-                       Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for invite exceptions");
                        if (list)
                        {
                                for (modelist::iterator it = list->begin(); it != list->end(); it++)

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 104e5da337deb198e9a2666bcd240174dc47dfed..0a60862af02be5ddf5fbfac209c0e1c5e6b9577a 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -55,12 +55,12 @@ class cmd_samode : public command_t
                 * Handles an SAMODE request. Notifies all +s users.
                 */
                std::string result;
-               Srv->Log(DEBUG,"SAMODE: Being handled");
+               log(DEBUG,"SAMODE: Being handled");
                userrec* n = new userrec(ServerInstance);
                n->fd = FD_MAGIC_NUMBER;
                Srv->SendMode(parameters,pcnt,n);
                delete n;
-               Srv->Log(DEBUG,"SAMODE: Modechange handled");
+               log(DEBUG,"SAMODE: Modechange handled");
                result = std::string(user->nick);
                result.append(" used SAMODE");
                for (int n = 0; n < pcnt; n++)