Rewrite logging calls to use the new APIs.

13 files changed, 30 insertions, 30 deletions

diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index 47b6497a8..e5470d9c2 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -130,7 +130,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, Params& params)
 		time_t ourTS = chan->age;
 		if (TS != ourTS)
 		{
-			ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Merge FJOIN received for %s, ourTS: %lu, TS: %lu, difference: %ld",
+			ServerInstance->Logs.Debug(MODNAME, "Merge FJOIN received for %s, ourTS: %lu, TS: %lu, difference: %ld",
 				chan->name.c_str(), (unsigned long)ourTS, (unsigned long)TS, (long)(ourTS - TS));
 			/* If our TS is less than theirs, we dont accept their modes */
 			if (ourTS < TS)
@@ -140,7 +140,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, Params& params)
 				// Servers behind us won't react this way because the forwarded FJOIN will have the correct TS.
 				if (!sourceserver->IsBursting())
 				{
-					ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Server %s recreated channel %s with higher TS, resyncing", sourceserver->GetName().c_str(), chan->name.c_str());
+					ServerInstance->Logs.Debug(MODNAME, "Server %s recreated channel %s with higher TS, resyncing", sourceserver->GetName().c_str(), chan->name.c_str());
 					sourceserver->GetSocket()->SyncChannel(chan);
 				}
 				apply_other_sides_modes = false;
diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
index c97e9a49b..eac406184 100644
--- a/src/modules/m_spanningtree/hmac.cpp
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -65,7 +65,7 @@ std::string TreeSocket::MakePass(const std::string &password, const std::string
 		return "AUTH:" + Base64::Encode(sha256->hmac(password, challenge));
 
 	if (!challenge.empty() && !sha256)
-		ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Not authenticating to server using SHA256/HMAC because we don't have an SHA256 provider (e.g. the sha2 module) loaded!");
+		ServerInstance->Logs.Normal(MODNAME, "Not authenticating to server using SHA256/HMAC because we don't have an SHA256 provider (e.g. the sha2 module) loaded!");
 
 	return password;
 }
diff --git a/src/modules/m_spanningtree/ijoin.cpp b/src/modules/m_spanningtree/ijoin.cpp
index 38d5edebe..1e756b115 100644
--- a/src/modules/m_spanningtree/ijoin.cpp
+++ b/src/modules/m_spanningtree/ijoin.cpp
@@ -32,7 +32,7 @@ CmdResult CommandIJoin::HandleRemote(RemoteUser* user, Params& params)
 	{
 		// Desync detected, recover
 		// Ignore the join and send RESYNC, this will result in the remote server sending all channel data to us
-		ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Received IJOIN for nonexistent channel: " + params[0]);
+		ServerInstance->Logs.Debug(MODNAME, "Received IJOIN for nonexistent channel: " + params[0]);
 
 		CmdBuilder("RESYNC").push(params[0]).Unicast(user);
 
@@ -59,12 +59,12 @@ CmdResult CommandIJoin::HandleRemote(RemoteUser* user, Params& params)
 
 CmdResult CommandResync::HandleServer(TreeServer* server, CommandBase::Params& params)
 {
-	ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Resyncing " + params[0]);
+	ServerInstance->Logs.Debug(MODNAME, "Resyncing " + params[0]);
 	Channel* chan = ServerInstance->Channels.Find(params[0]);
 	if (!chan)
 	{
 		// This can happen for a number of reasons, safe to ignore
-		ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Channel does not exist");
+		ServerInstance->Logs.Debug(MODNAME, "Channel does not exist");
 		return CmdResult::FAILURE;
 	}
 
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index cc41d434e..466cd8b93 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -627,7 +627,7 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick)
 	}
 	else if (!loopCall)
 	{
-		ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "WARNING: Changed nick of remote user %s from %s to %s TS %lu by ourselves!", user->uuid.c_str(), oldnick.c_str(), user->nick.c_str(), (unsigned long) user->age);
+		ServerInstance->Logs.Normal(MODNAME, "WARNING: Changed nick of remote user %s from %s to %s TS %lu by ourselves!", user->uuid.c_str(), oldnick.c_str(), user->nick.c_str(), (unsigned long) user->age);
 	}
 }
 
@@ -648,7 +648,7 @@ void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::s
 
 void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
 {
-	ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "OnPreRehash called with param %s", parameter.c_str());
+	ServerInstance->Logs.Debug(MODNAME, "OnPreRehash called with param %s", parameter.c_str());
 
 	// Send out to other servers
 	if (!parameter.empty() && parameter[0] != '-')
diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index c98e8ed4a..b0e079de0 100644
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -90,7 +90,7 @@ bool SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remo
 		}
 	}
 
-	ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Nick collision on \"%s\" caused by %s: %s/%lu/%s@%s %d <-> %s/%lu/%s@%s %d", u->nick.c_str(), collidecmd,
+	ServerInstance->Logs.Debug(MODNAME, "Nick collision on \"%s\" caused by %s: %s/%lu/%s@%s %d <-> %s/%lu/%s@%s %d", u->nick.c_str(), collidecmd,
 		u->uuid.c_str(), (unsigned long)localts, u->ident.c_str(), u->GetIPString().c_str(), bChangeLocal,
 		remoteuid.c_str(), (unsigned long)remotets, remoteident.c_str(), remoteip.c_str(), bChangeRemote);
 
diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index 64fd76852..4769d8a94 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -60,7 +60,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm
 			sdest = FindRouteTarget(routing.target);
 			if (!sdest)
 			{
-				ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Trying to route %s%s to nonexistent server %s", (encap ? "ENCAP " : ""), command.c_str(), routing.target.c_str());
+				ServerInstance->Logs.Normal(MODNAME, "Trying to route %s%s to nonexistent server %s", (encap ? "ENCAP " : ""), command.c_str(), routing.target.c_str());
 				return;
 			}
 		}
@@ -76,7 +76,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm
 		Module* srcmodule = thiscmd->creator;
 		if (!(srcmodule->properties & (VF_COMMON | VF_CORE)) && srcmodule != Creator)
 		{
-			ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Routed command %s from non-VF_COMMON module %s",
+			ServerInstance->Logs.Normal(MODNAME, "Routed command %s from non-VF_COMMON module %s",
 				command.c_str(), srcmodule->ModuleSourceFile.c_str());
 			return;
 		}
diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index d8ce53d4a..4c449f2c4 100644
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -144,7 +144,7 @@ void SecurityIPResolver::OnLookupComplete(const DNS::Query *r)
 					continue;
 
 				Utils->ValidIPs.push_back(ans_record.rdata);
-				ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Resolved '%s' as a valid IP address for link '%s'",
+				ServerInstance->Logs.Normal(MODNAME, "Resolved '%s' as a valid IP address for link '%s'",
 					ans_record.rdata.c_str(), MyLink->Name.c_str());
 			}
 			break;
@@ -160,7 +160,7 @@ void SecurityIPResolver::OnError(const DNS::Query *r)
 	if (CheckIPv4())
 		return;
 
-	ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Could not resolve IP associated with link '%s': %s",
+	ServerInstance->Logs.Debug(MODNAME, "Could not resolve IP associated with link '%s': %s",
 		MyLink->Name.c_str(), this->manager->GetErrorStr(r->error).c_str());
 }
 
diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index b12c2e5e5..8f0b68b96 100644
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -191,7 +191,7 @@ bool TreeSocket::CheckDuplicate(const std::string& sname, const std::string& sid
 	}
 
 	// Check if the id is not in use by a server that's already fully connected
-	ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Looking for dupe SID %s", sid.c_str());
+	ServerInstance->Logs.Debug(MODNAME, "Looking for dupe SID %s", sid.c_str());
 	CheckDupe = Utils->FindServerID(sid);
 
 	if (CheckDupe)
diff --git a/src/modules/m_spanningtree/sinfo.cpp b/src/modules/m_spanningtree/sinfo.cpp
index 5457d84db..1ea2d1774 100644
--- a/src/modules/m_spanningtree/sinfo.cpp
+++ b/src/modules/m_spanningtree/sinfo.cpp
@@ -43,7 +43,7 @@ CmdResult CommandSInfo::HandleServer(TreeServer* server, CommandBase::Params& pa
 	else if (key == "desc")
 	{
 		// Only sent when the description of a server changes because of a rehash; not sent on burst
-		ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Server description of " + server->GetName() + " changed: " + value);
+		ServerInstance->Logs.Normal(MODNAME, "Server description of " + server->GetName() + " changed: " + value);
 		server->SetDesc(value);
 	}
 
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 0238c1842..34493716c 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -67,7 +67,7 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s
 	, UserCount(0)
 	, Hidden(Hide)
 {
-	ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "New server %s behind_bursting %u", GetName().c_str(), behind_bursting);
+	ServerInstance->Logs.Debug(MODNAME, "New server %s behind_bursting %u", GetName().c_str(), behind_bursting);
 	CheckService();
 
 	ServerInstance->Timers.AddTimer(&pingtimer);
@@ -138,7 +138,7 @@ void TreeServer::BeginBurst(uint64_t startms)
 	if ((!startms) || (startms > now))
 		startms = now;
 	this->StartBurst = startms;
-	ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Server %s started bursting at time %s behind_bursting %u", GetId().c_str(), ConvToStr(startms).c_str(), behind_bursting);
+	ServerInstance->Logs.Debug(MODNAME, "Server %s started bursting at time %s behind_bursting %u", GetId().c_str(), ConvToStr(startms).c_str(), behind_bursting);
 }
 
 void TreeServer::FinishBurstInternal()
@@ -147,7 +147,7 @@ void TreeServer::FinishBurstInternal()
 	// introduced during a netburst may later send ENDBURST which would normally decrease this counter
 	if (behind_bursting > 0)
 		behind_bursting--;
-	ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "FinishBurstInternal() %s behind_bursting %u", GetName().c_str(), behind_bursting);
+	ServerInstance->Logs.Debug(MODNAME, "FinishBurstInternal() %s behind_bursting %u", GetName().c_str(), behind_bursting);
 
 	for (const auto& child : Children)
 		child->FinishBurstInternal();
@@ -204,7 +204,7 @@ void TreeServer::SQuitInternal(unsigned int& num_lost_servers, bool error)
 	if (isdead)
 		return;
 
-	ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Server %s lost in split", GetName().c_str());
+	ServerInstance->Logs.Debug(MODNAME, "Server %s lost in split", GetName().c_str());
 
 	for (const auto& server : Children)
 		server->SQuitInternal(num_lost_servers, error);
@@ -247,7 +247,7 @@ void TreeServer::CheckService()
 		{
 			if (this->IsRoot())
 			{
-				ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Servers should not mark themselves as a service (at " + tag->source.str() + ")");
+				ServerInstance->Logs.Normal(MODNAME, "Servers should not mark themselves as a service (at " + tag->source.str() + ")");
 				return;
 			}
 
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 46525bee3..7cf1e170c 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -164,7 +164,7 @@ CmdResult CommandSQuit::HandleServer(TreeServer* server, CommandBase::Params& pa
 	TreeServer* quitting = Utils->FindServer(params[0]);
 	if (!quitting)
 	{
-		ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Squit from unknown server");
+		ServerInstance->Logs.Normal(MODNAME, "Squit from unknown server");
 		return CmdResult::FAILURE;
 	}
 
@@ -220,8 +220,8 @@ void TreeSocket::OnDataReady()
 		}
 		catch (CoreException& ex)
 		{
-			ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Error while processing: " + line);
-			ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, ex.GetReason());
+			ServerInstance->Logs.Normal(MODNAME, "Error while processing: " + line);
+			ServerInstance->Logs.Normal(MODNAME, ex.GetReason());
 			SendError(ex.GetReason() + " - check the log file for details");
 		}
 
@@ -237,7 +237,7 @@ static std::string newline("\n");
 
 void TreeSocket::WriteLineInternal(const std::string& line)
 {
-	ServerInstance->Logs.Log(MODNAME, LOG_RAWIO, "S[%d] O %s", this->GetFd(), line.c_str());
+	ServerInstance->Logs.RawIO(MODNAME, "S[%d] O %s", this->GetFd(), line.c_str());
 	this->WriteData(line);
 	this->WriteData(newline);
 }
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index de3550b42..0f6cb5d33 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -93,7 +93,7 @@ void TreeSocket::ProcessLine(std::string &line)
 	std::string command;
 	CommandBase::Params params;
 
-	ServerInstance->Logs.Log(MODNAME, LOG_RAWIO, "S[%d] I %s", this->GetFd(), line.c_str());
+	ServerInstance->Logs.RawIO(MODNAME, "S[%d] I %s", this->GetFd(), line.c_str());
 
 	Split(line, tags, prefix, command, params);
 
@@ -308,7 +308,7 @@ void TreeSocket::ProcessConnectedLine(std::string& taglist, std::string& prefix,
 	User* who = FindSource(prefix, command);
 	if (!who)
 	{
-		ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Command '%s' from unknown prefix '%s'! Dropping entire command.", command.c_str(), prefix.c_str());
+		ServerInstance->Logs.Debug(MODNAME, "Command '%s' from unknown prefix '%s'! Dropping entire command.", command.c_str(), prefix.c_str());
 		return;
 	}
 
@@ -331,7 +331,7 @@ void TreeSocket::ProcessConnectedLine(std::string& taglist, std::string& prefix,
 	TreeServer* const server = TreeServer::Get(who);
 	if (server->GetSocket() != this)
 	{
-		ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Protocol violation: Fake direction '%s' from connection '%s'", prefix.c_str(), linkID.c_str());
+		ServerInstance->Logs.Debug(MODNAME, "Protocol violation: Fake direction '%s' from connection '%s'", prefix.c_str(), linkID.c_str());
 		return;
 	}
 
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 539dbe82f..58b908413 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -204,7 +204,7 @@ void SpanningTreeUtilities::RefreshIPCache()
 	{
 		if (!L->Port)
 		{
-			ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Ignoring a link block without a port.");
+			ServerInstance->Logs.Normal(MODNAME, "Ignoring a link block without a port.");
 			/* Invalid link block */
 			continue;
 		}
@@ -293,11 +293,11 @@ void SpanningTreeUtilities::ReadConfiguration()
 		if (L->IPAddr.empty())
 		{
 			L->IPAddr = "*";
-			ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Configuration warning: Link block '" + L->Name + "' has no IP defined! This will allow any IP to connect as this server, and MAY not be what you want.");
+			ServerInstance->Logs.Normal(MODNAME, "Configuration warning: Link block '" + L->Name + "' has no IP defined! This will allow any IP to connect as this server, and MAY not be what you want.");
 		}
 
 		if (!L->Port && L->IPAddr.find('/') == std::string::npos)
-			ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Configuration warning: Link block '" + L->Name + "' has no port defined, you will not be able to /connect it.");
+			ServerInstance->Logs.Normal(MODNAME, "Configuration warning: Link block '" + L->Name + "' has no port defined, you will not be able to /connect it.");
 
 		L->Fingerprint.erase(std::remove(L->Fingerprint.begin(), L->Fingerprint.end(), ':'), L->Fingerprint.end());
 		LinkBlocks.push_back(L);