Now two types of log macro, log() and ilog(). log() assumes an InspIRCd object called ServerInstance, ilog() takes an InspIRCd object as first param.

TODO: Run a regexp over these, using perl, to translate them into InspIRCd::Log calls and then eliminate the macro :)


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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/users.cpp b/src/users.cpp
index 938557b59..f6adb85cf 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -73,7 +73,7 @@ bool DoType(ServerConfig* conf, const char* tag, char** entries, void** values,
 	char* Classes = (char*)values[1];
 	
 	opertypes[TypeName] = strdup(Classes);
-	log(DEBUG,"Read oper TYPE '%s' with classes '%s'",TypeName,Classes);
+	ilog(conf->GetInstance(),DEBUG,"Read oper TYPE '%s' with classes '%s'",TypeName,Classes);
 	return true;
 }
 
@@ -83,7 +83,7 @@ bool DoClass(ServerConfig* conf, const char* tag, char** entries, void** values,
 	char* CommandList = (char*)values[1];
 	
 	operclass[ClassName] = strdup(CommandList);
-	log(DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
+	ilog(conf->GetInstance(),DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
 	return true;
 }
 
@@ -676,7 +676,7 @@ void userrec::QuitUser(InspIRCd* Instance, userrec *user,const std::string &quit
 			}
 			catch (ModuleException& modexcept)
 			{
-				log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
+				ilog(Instance,DEBUG,"Module exception cought: %s",modexcept.GetReason());
 			}
 		}
 		
@@ -701,7 +701,7 @@ void userrec::QuitUser(InspIRCd* Instance, userrec *user,const std::string &quit
 
 	if (iter != Instance->clientlist.end())
 	{
-		log(DEBUG,"deleting user hash value %lx",(unsigned long)user);
+		ilog(Instance,DEBUG,"deleting user hash value %lx",(unsigned long)user);
 		if (IS_LOCAL(user))
 		{
 			Instance->fd_ref_table[user->fd] = NULL;
@@ -812,7 +812,7 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
 		Instance->clientlist.erase(iter);
 	}
 
-	log(DEBUG,"AddClient: %d %d %s",socket,port,ipaddr);
+	ilog(Instance,DEBUG,"AddClient: %d %d %s",socket,port,ipaddr);
 	
 	_new = new userrec(Instance);
 	Instance->clientlist[tempnick] = _new;
@@ -827,9 +827,9 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
 	_new->signon = Instance->Time() + Instance->Config->dns_timeout;
 	_new->lastping = 1;
 
-	log(DEBUG,"Setting socket addresses");
+	ilog(Instance,DEBUG,"Setting socket addresses");
 	_new->SetSockAddr(AF_FAMILY, ipaddr, port);
-	log(DEBUG,"Socket addresses set.");
+	ilog(Instance,DEBUG,"Socket addresses set.");
 
 	/* Smarter than your average bear^H^H^H^Hset of strlcpys. */
 	for (const char* temp = _new->GetIPString(); *temp && j < 64; temp++, j++)