Removal of Server::Log -- not much ever used it anyway with the ability to use log(). log() macro still exists, and calls InspIRCd::Log()

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

5 files changed, 11 insertions, 23 deletions

diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index 891b550ff..0f52c6aa4 100644
--- 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 eeb803d5a..a6fa7ab8e 100644
--- 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 5fcc30cc4..a7d73af18 100644
--- 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 30ece8f60..9bb92fd61 100644
--- 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 c0f02f322..f9f38fc17 100644
--- 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)