Rework the levels things are logged at to make more sense.

22 files changed, 46 insertions, 46 deletions

diff --git a/src/modules/extra/m_argon2.cpp b/src/modules/extra/m_argon2.cpp
index e972939fe..305868e0b 100644
--- a/src/modules/extra/m_argon2.cpp
+++ b/src/modules/extra/m_argon2.cpp
@@ -48,7 +48,7 @@ private:
 				return ARGON2_VERSION_13;
 		}
 
-		ServerInstance->Logs.Normal("MODULE", "Unknown Argon2 version (%lu) specified; assuming 13",
+		ServerInstance->Logs.Warning(MODNAME, "Unknown Argon2 version (%lu) specified; assuming 13",
 			version);
 		return ARGON2_VERSION_13;
 	}
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 9addb1aeb..dd2125d0b 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -331,7 +331,7 @@ public:
 		unsigned int port = static_cast<unsigned int>(config->getUInt("port", 3306, 1, 65535));
 		if (!mysql_real_connect(connection, host.c_str(), user.c_str(), pass.c_str(), dbname.c_str(), port, nullptr, CLIENT_IGNORE_SIGPIPE))
 		{
-			ServerInstance->Logs.Normal(MODNAME, "Unable to connect to the %s MySQL server: %s",
+			ServerInstance->Logs.Error(MODNAME, "Unable to connect to the %s MySQL server: %s",
 				GetId().c_str(), mysql_error(connection));
 			return false;
 		}
@@ -340,7 +340,7 @@ public:
 		const std::string charset = config->getString("charset");
 		if (!charset.empty() && mysql_set_character_set(connection, charset.c_str()))
 		{
-			ServerInstance->Logs.Normal(MODNAME, "Could not set character set for %s to \"%s\": %s",
+			ServerInstance->Logs.Error(MODNAME, "Could not set character set for %s to \"%s\": %s",
 				GetId().c_str(), charset.c_str(), mysql_error(connection));
 			return false;
 		}
@@ -349,7 +349,7 @@ public:
 		const std::string initialquery = config->getString("initialquery");
 		if (!initialquery.empty() && mysql_real_query(connection, initialquery.data(), initialquery.length()))
 		{
-			ServerInstance->Logs.Normal(MODNAME, "Could not execute initial query \"%s\" for %s: %s",
+			ServerInstance->Logs.Error(MODNAME, "Could not execute initial query \"%s\" for %s: %s",
 				initialquery.c_str(), name.c_str(), mysql_error(connection));
 			return false;
 		}
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 912b4f18c..cb9ce1f23 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -279,7 +279,7 @@ public:
 
 	bool HandleConnectError(const char* reason)
 	{
-		ServerInstance->Logs.Normal(MODNAME, "Could not connect to the \"%s\" database: %s",
+		ServerInstance->Logs.Error(MODNAME, "Could not connect to the \"%s\" database: %s",
 			GetId().c_str(), reason);
 		return false;
 	}
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 7989c5230..dd4e0b3c2 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -111,7 +111,7 @@ public:
 			// Even in case of an error conn must be closed
 			sqlite3_close(conn);
 			conn = nullptr;
-			ServerInstance->Logs.Normal(MODNAME, "WARNING: Could not open DB with id: " + tag->getString("id"));
+			ServerInstance->Logs.Error(MODNAME, "WARNING: Could not open DB with id: " + tag->getString("id"));
 		}
 	}
 
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 0e6b83832..77fdfc006 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -505,7 +505,7 @@ namespace GnuTLS
 				else if ((found) && (stripped != priostr))
 				{
 					// Prio string was set in the config and we ended up with something that works but different
-					ServerInstance->Logs.Normal(MODNAME, "Priority string for profile \"%s\" contains unknown tokens, stripped to \"%s\"", profilename.c_str(), stripped.c_str());
+					ServerInstance->Logs.Warning(MODNAME, "Priority string for profile \"%s\" contains unknown tokens, stripped to \"%s\"", profilename.c_str(), stripped.c_str());
 				}
 				priostr.swap(stripped);
 			}
@@ -1072,14 +1072,14 @@ class ModuleSSLGnuTLS final
 		{
 			if (!stdalgo::string::equalsci(tag->getString("provider"), "gnutls"))
 			{
-				ServerInstance->Logs.Normal(MODNAME, "Ignoring non-GnuTLS <sslprofile> tag at " + tag->source.str());
+				ServerInstance->Logs.Debug(MODNAME, "Ignoring non-GnuTLS <sslprofile> tag at " + tag->source.str());
 				continue;
 			}
 
 			std::string name = tag->getString("name");
 			if (name.empty())
 			{
-				ServerInstance->Logs.Normal(MODNAME, "Ignoring <sslprofile> tag without name at " + tag->source.str());
+				ServerInstance->Logs.Warning(MODNAME, "Ignoring <sslprofile> tag without name at " + tag->source.str());
 				continue;
 			}
 
diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp
index ee9609cc7..8cc07b16e 100644
--- a/src/modules/extra/m_ssl_mbedtls.cpp
+++ b/src/modules/extra/m_ssl_mbedtls.cpp
@@ -902,14 +902,14 @@ private:
 		{
 			if (!stdalgo::string::equalsci(tag->getString("provider"), "mbedtls"))
 			{
-				ServerInstance->Logs.Normal(MODNAME, "Ignoring non-mbedTLS <sslprofile> tag at " + tag->source.str());
+				ServerInstance->Logs.Debug(MODNAME, "Ignoring non-mbedTLS <sslprofile> tag at " + tag->source.str());
 				continue;
 			}
 
 			std::string name = tag->getString("name");
 			if (name.empty())
 			{
-				ServerInstance->Logs.Normal(MODNAME, "Ignoring <sslprofile> tag without name at " + tag->source.str());
+				ServerInstance->Logs.Warning(MODNAME, "Ignoring <sslprofile> tag without name at " + tag->source.str());
 				continue;
 			}
 
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index e6a533762..db9499907 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -948,14 +948,14 @@ class ModuleSSLOpenSSL final
 		{
 			if (!stdalgo::string::equalsci(tag->getString("provider"), "openssl"))
 			{
-				ServerInstance->Logs.Normal(MODNAME, "Ignoring non-OpenSSL <sslprofile> tag at " + tag->source.str());
+				ServerInstance->Logs.Debug(MODNAME, "Ignoring non-OpenSSL <sslprofile> tag at " + tag->source.str());
 				continue;
 			}
 
 			std::string name = tag->getString("name");
 			if (name.empty())
 			{
-				ServerInstance->Logs.Normal(MODNAME, "Ignoring <sslprofile> tag without name at " + tag->source.str());
+				ServerInstance->Logs.Warning(MODNAME, "Ignoring <sslprofile> tag without name at " + tag->source.str());
 				continue;
 			}
 
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index c164014d9..9400f36b7 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -146,12 +146,12 @@ struct CallerIDExtInfo final
 			callerid_data* target = this->Get(user, false);
 			if (!target)
 			{
-				ServerInstance->Logs.Normal(MODNAME, "ERROR: Inconsistency detected in callerid state, please report (1)");
+				ServerInstance->Logs.Debug(MODNAME, "ERROR: Inconsistency detected in callerid state, please report (1)");
 				continue; // shouldn't happen, but oh well.
 			}
 
 			if (!stdalgo::vector::swaperase(target->wholistsme, dat))
-				ServerInstance->Logs.Normal(MODNAME, "ERROR: Inconsistency detected in callerid state, please report (2)");
+				ServerInstance->Logs.Debug(MODNAME, "ERROR: Inconsistency detected in callerid state, please report (2)");
 		}
 		delete dat;
 	}
@@ -322,12 +322,12 @@ public:
 		if (!dat2)
 		{
 			// How the fuck is this possible.
-			ServerInstance->Logs.Normal(MODNAME, "ERROR: Inconsistency detected in callerid state, please report (3)");
+			ServerInstance->Logs.Debug(MODNAME, "ERROR: Inconsistency detected in callerid state, please report (3)");
 			return false;
 		}
 
 		if (!stdalgo::vector::swaperase(dat2->wholistsme, dat))
-			ServerInstance->Logs.Normal(MODNAME, "ERROR: Inconsistency detected in callerid state, please report (4)");
+			ServerInstance->Logs.Debug(MODNAME, "ERROR: Inconsistency detected in callerid state, please report (4)");
 
 		user->WriteNotice(whotoremove->nick + " is no longer on your accept list");
 		return true;
@@ -383,7 +383,7 @@ private:
 		{
 			// Find me on their callerid list
 			if (!dat->accepting.erase(who))
-				ServerInstance->Logs.Normal(MODNAME, "ERROR: Inconsistency detected in callerid state, please report (5)");
+				ServerInstance->Logs.Debug(MODNAME, "ERROR: Inconsistency detected in callerid state, please report (5)");
 		}
 
 		userdata->wholistsme.clear();
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index cfd00ff47..d041ef4ba 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -890,7 +890,7 @@ void ModuleFilter::ReadFilters()
 		if (result.first)
 			removedfilters.erase(pattern);
 		else
-			ServerInstance->Logs.Normal(MODNAME, "Filter '%s' could not be added: %s", pattern.c_str(), result.second.c_str());
+			ServerInstance->Logs.Warning(MODNAME, "Filter '%s' could not be added: %s", pattern.c_str(), result.second.c_str());
 	}
 
 	if (!removedfilters.empty())
diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index c2572ab12..0d378e69f 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -77,7 +77,7 @@ static bool WriteDatabase(PermChannel& permchanmode, bool save_listmodes)
 	std::ofstream stream(permchannelsnewconf);
 	if (!stream.is_open())
 	{
-		ServerInstance->Logs.Normal(MODNAME, "Cannot create database \"%s\"! %s (%d)", permchannelsnewconf.c_str(), strerror(errno), errno);
+		ServerInstance->Logs.Error(MODNAME, "Cannot create database \"%s\"! %s (%d)", permchannelsnewconf.c_str(), strerror(errno), errno);
 		ServerInstance->SNO.WriteToSnoMask('a', "database: cannot create new permchan db \"%s\": %s (%d)", permchannelsnewconf.c_str(), strerror(errno), errno);
 		return false;
 	}
@@ -149,7 +149,7 @@ static bool WriteDatabase(PermChannel& permchanmode, bool save_listmodes)
 
 	if (stream.fail())
 	{
-		ServerInstance->Logs.Normal(MODNAME, "Cannot write to new database \"%s\"! %s (%d)", permchannelsnewconf.c_str(), strerror(errno), errno);
+		ServerInstance->Logs.Error(MODNAME, "Cannot write to new database \"%s\"! %s (%d)", permchannelsnewconf.c_str(), strerror(errno), errno);
 		ServerInstance->SNO.WriteToSnoMask('a', "database: cannot write to new permchan db \"%s\": %s (%d)", permchannelsnewconf.c_str(), strerror(errno), errno);
 		return false;
 	}
@@ -161,7 +161,7 @@ static bool WriteDatabase(PermChannel& permchanmode, bool save_listmodes)
 	// Use rename to move temporary to new db - this is guaranteed not to fuck up, even in case of a crash.
 	if (rename(permchannelsnewconf.c_str(), permchannelsconf.c_str()) < 0)
 	{
-		ServerInstance->Logs.Normal(MODNAME, "Cannot replace old database \"%s\" with new database \"%s\"! %s (%d)", permchannelsconf.c_str(), permchannelsnewconf.c_str(), strerror(errno), errno);
+		ServerInstance->Logs.Error(MODNAME, "Cannot replace old database \"%s\" with new database \"%s\"! %s (%d)", permchannelsconf.c_str(), permchannelsnewconf.c_str(), strerror(errno), errno);
 		ServerInstance->SNO.WriteToSnoMask('a', "database: cannot replace old permchan db \"%s\" with new db \"%s\": %s (%d)", permchannelsconf.c_str(), permchannelsnewconf.c_str(), strerror(errno), errno);
 		return false;
 	}
@@ -211,7 +211,7 @@ public:
 
 			if (!ServerInstance->Channels.IsChannel(channel))
 			{
-				ServerInstance->Logs.Normal(MODNAME, "Ignoring permchannels tag with invalid channel name (\"" + channel + "\")");
+				ServerInstance->Logs.Warning(MODNAME, "Ignoring permchannels tag with invalid channel name (\"" + channel + "\")");
 				continue;
 			}
 
@@ -317,7 +317,7 @@ public:
 			}
 			catch (const CoreException& e)
 			{
-				ServerInstance->Logs.Normal(MODNAME, "Error loading permchannels database: " + std::string(e.GetReason()));
+				ServerInstance->Logs.Error(MODNAME, "Error loading permchannels database: %s", e.what());
 			}
 		}
 	}
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index b11894870..ca4decdc2 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -57,7 +57,7 @@ private:
 
 		if (InspIRCd::Match(server->GetName(), sasl_target))
 		{
-			ServerInstance->Logs.Normal(MODNAME, "SASL target server \"%s\" %s", sasl_target.c_str(), (linked ? "came online" : "went offline"));
+			ServerInstance->Logs.Debug(MODNAME, "SASL target server \"%s\" %s", sasl_target.c_str(), (linked ? "came online" : "went offline"));
 			online = linked;
 		}
 	}
@@ -257,7 +257,7 @@ public:
 				else if (msg[2] == "M")
 					this->user->WriteNumeric(RPL_SASLMECHS, msg[3], "are available SASL mechanisms");
 				else
-					ServerInstance->Logs.Normal(MODNAME, "Services sent an unknown SASL message \"%s\" \"%s\"", msg[2].c_str(), msg[3].c_str());
+					ServerInstance->Logs.Debug(MODNAME, "Services sent an unknown SASL message \"%s\" \"%s\"", msg[2].c_str(), msg[3].c_str());
 				break;
 
 			case SASL_DONE:
diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp
index 3eaae462f..f24d1259d 100644
--- a/src/modules/m_showfile.cpp
+++ b/src/modules/m_showfile.cpp
@@ -169,7 +169,7 @@ public:
 			}
 			catch (const CoreException& ex)
 			{
-				ServerInstance->Logs.Normal(MODNAME, "Error: " + ex.GetReason() + " at " + tag->source.str());
+				ServerInstance->Logs.Warning(MODNAME, "Error: " + ex.GetReason() + " at " + tag->source.str());
 			}
 		}
 
diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
index 0023fa7d5..55f58ce08 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.Normal(MODNAME, "Not authenticating to server using SHA256/HMAC because we don't have an SHA256 provider (e.g. the sha2 module) loaded!");
+		ServerInstance->Logs.Warning(MODNAME, "Not authenticating to server using HMAC-SHA256 because we don't have an SHA256 provider (e.g. the sha2 module) loaded!");
 
 	return password;
 }
diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index 398cf05be..e9d568010 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.Normal(MODNAME, "Trying to route %s%s to nonexistent server %s", (encap ? "ENCAP " : ""), command.c_str(), routing.target.c_str());
+				ServerInstance->Logs.Debug(MODNAME, "Trying to route %s%s to nonexistent server %s", (encap ? "ENCAP " : ""), command.c_str(), routing.target.c_str());
 				return;
 			}
 		}
diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index fbaa6c21b..98297e49c 100644
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -156,7 +156,7 @@ void SecurityIPResolver::OnError(const DNS::Query* r)
 	if (CheckIPv4())
 		return;
 
-	ServerInstance->Logs.Debug(MODNAME, "Could not resolve IP associated with link '%s': %s",
+	ServerInstance->Logs.Warning(MODNAME, "Could not resolve IP associated with link '%s': %s",
 		link->Name.c_str(), this->manager->GetErrorStr(r->error).c_str());
 }
 
diff --git a/src/modules/m_spanningtree/sinfo.cpp b/src/modules/m_spanningtree/sinfo.cpp
index ea5257360..f4d46b57b 100644
--- a/src/modules/m_spanningtree/sinfo.cpp
+++ b/src/modules/m_spanningtree/sinfo.cpp
@@ -35,7 +35,7 @@ CmdResult CommandSInfo::HandleServer(TreeServer* server, CommandBase::Params& pa
 	else if (irc::equals(key,  "desc"))
 	{
 		// Only sent when the description of a server changes because of a rehash; not sent on burst
-		ServerInstance->Logs.Normal(MODNAME, "Server description of " + server->GetName() + " changed: " + value);
+		ServerInstance->Logs.Debug(MODNAME, "Server description of " + server->GetName() + " changed: " + value);
 		server->SetDesc(value);
 	}
 	else if (irc::equals(key,  "rawbranch"))
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 98838c3f2..fb6d0b64f 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -242,7 +242,7 @@ void TreeServer::CheckService()
 		{
 			if (this->IsRoot())
 			{
-				ServerInstance->Logs.Normal(MODNAME, "Servers should not mark themselves as a service (at " + tag->source.str() + ")");
+				ServerInstance->Logs.Warning(MODNAME, "Servers should not mark themselves as a service (at " + tag->source.str() + ")");
 				return;
 			}
 
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index baceab9e3..d0013fc30 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -205,7 +205,7 @@ void SpanningTreeUtilities::RefreshIPCache()
 		bool isunix = L->IPAddr.find('/') != std::string::npos;
 		if (!L->Port && !isunix)
 		{
-			ServerInstance->Logs.Normal(MODNAME, "Ignoring a link block without a port.");
+			ServerInstance->Logs.Warning(MODNAME, "Ignoring a link block without a port.");
 			/* Invalid link block */
 			continue;
 		}
@@ -304,11 +304,11 @@ void SpanningTreeUtilities::ReadConfiguration()
 		if (L->IPAddr.empty())
 		{
 			L->IPAddr = "*";
-			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.");
+			ServerInstance->Logs.Warning(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.Normal(MODNAME, "Configuration warning: Link block '" + L->Name + "' has no port defined, you will not be able to /connect it.");
+			ServerInstance->Logs.Warning(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);
diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index 8eb295222..38811da0b 100644
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -87,7 +87,7 @@ public:
 			auto tblk = ServerInstance->Config->OperTypes.find(type);
 			if (tblk == ServerInstance->Config->OperTypes.end())
 			{
-				ServerInstance->Logs.Normal(MODNAME, "Sqloper block " + name + " has missing type " + type);
+				ServerInstance->Logs.Warning(MODNAME, "Sqloper block " + name + " has missing type " + type);
 				ServerInstance->SNO.WriteGlobalSno('a', "m_sqloper: Oper block %s has missing type %s", name.c_str(), type.c_str());
 				continue;
 			}
@@ -107,7 +107,7 @@ public:
 
 	void OnError(const SQL::Error& error) override
 	{
-		ServerInstance->Logs.Normal(MODNAME, "query failed (%s)", error.ToString());
+		ServerInstance->Logs.Warning(MODNAME, "query failed (%s)", error.ToString());
 		ServerInstance->SNO.WriteGlobalSno('a', "m_sqloper: Failed to update blocks from database");
 		if (!uid.empty())
 		{
@@ -147,7 +147,7 @@ public:
 		}
 		else
 		{
-			ServerInstance->Logs.Error(MODNAME, "BUG: WHAT?! Why do we have no OPER command?!");
+			ServerInstance->Logs.Debug(MODNAME, "BUG: WHAT?! Why do we have no OPER command?!");
 		}
 	}
 };
@@ -208,7 +208,7 @@ public:
 				 */
 				return MOD_RES_DENY;
 			}
-			ServerInstance->Logs.Normal(MODNAME, "database not present");
+			ServerInstance->Logs.Warning(MODNAME, "database not present");
 		}
 		else if (active)
 		{
diff --git a/src/modules/m_topiclock.cpp b/src/modules/m_topiclock.cpp
index a959f0af2..3b8c6b988 100644
--- a/src/modules/m_topiclock.cpp
+++ b/src/modules/m_topiclock.cpp
@@ -54,7 +54,7 @@ public:
 			time_t topicts = ConvToNum<time_t>(parameters[1]);
 			if (!topicts)
 			{
-				ServerInstance->Logs.Normal(MODNAME, "Received SVSTOPIC with a 0 topicts, dropped.");
+				ServerInstance->Logs.Debug(MODNAME, "Received SVSTOPIC with a 0 topicts, dropped.");
 				return CmdResult::INVALID;
 			}
 
diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index e673843cd..9c44accba 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -111,7 +111,7 @@ public:
 			const std::string hash = tag->getString("hash", "plaintext", 1);
 			if (stdalgo::string::equalsci(hash, "plaintext"))
 			{
-				ServerInstance->Logs.Normal(MODNAME, "<vhost> tag for %s at %s contains an plain text password, this is insecure!",
+				ServerInstance->Logs.Warning(MODNAME, "<vhost> tag for %s at %s contains an plain text password, this is insecure!",
 					username.c_str(), tag->source.str().c_str());
 			}
 
diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index 41d50b8f4..f134c0473 100644
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -110,7 +110,7 @@ public:
 		std::ofstream stream(xlinenewdbpath);
 		if (!stream.is_open())
 		{
-			ServerInstance->Logs.Debug(MODNAME, "Cannot create database \"%s\"! %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
+			ServerInstance->Logs.Error(MODNAME, "Cannot create database \"%s\"! %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
 			ServerInstance->SNO.WriteToSnoMask('x', "database: cannot create new xline db \"%s\": %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
 			return false;
 		}
@@ -148,7 +148,7 @@ public:
 
 		if (stream.fail())
 		{
-			ServerInstance->Logs.Debug(MODNAME, "Cannot write to new database \"%s\"! %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
+			ServerInstance->Logs.Error(MODNAME, "Cannot write to new database \"%s\"! %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
 			ServerInstance->SNO.WriteToSnoMask('x', "database: cannot write to new xline db \"%s\": %s (%d)", xlinenewdbpath.c_str(), strerror(errno), errno);
 			return false;
 		}
@@ -160,7 +160,7 @@ public:
 		// Use rename to move temporary to new db - this is guaranteed not to fuck up, even in case of a crash.
 		if (rename(xlinenewdbpath.c_str(), xlinedbpath.c_str()) < 0)
 		{
-			ServerInstance->Logs.Debug(MODNAME, "Cannot replace old database \"%s\" with new database \"%s\"! %s (%d)", xlinedbpath.c_str(), xlinenewdbpath.c_str(), strerror(errno), errno);
+			ServerInstance->Logs.Error(MODNAME, "Cannot replace old database \"%s\" with new database \"%s\"! %s (%d)", xlinedbpath.c_str(), xlinenewdbpath.c_str(), strerror(errno), errno);
 			ServerInstance->SNO.WriteToSnoMask('x', "database: cannot replace old xline db \"%s\" with new db \"%s\": %s (%d)", xlinedbpath.c_str(), xlinenewdbpath.c_str(), strerror(errno), errno);
 			return false;
 		}
@@ -178,7 +178,7 @@ public:
 		std::ifstream stream(xlinedbpath);
 		if (!stream.is_open())
 		{
-			ServerInstance->Logs.Debug(MODNAME, "Cannot read database \"%s\"! %s (%d)", xlinedbpath.c_str(), strerror(errno), errno);
+			ServerInstance->Logs.Error(MODNAME, "Cannot read database \"%s\"! %s (%d)", xlinedbpath.c_str(), strerror(errno), errno);
 			ServerInstance->SNO.WriteToSnoMask('x', "database: cannot read xline db \"%s\": %s (%d)", xlinedbpath.c_str(), strerror(errno), errno);
 			return false;
 		}
@@ -205,7 +205,7 @@ public:
 				if (command_p[1] != "1")
 				{
 					stream.close();
-					ServerInstance->Logs.Debug(MODNAME, "I got database version %s - I don't understand it", command_p[1].c_str());
+					ServerInstance->Logs.Error(MODNAME, "I got database version %s - I don't understand it", command_p[1].c_str());
 					ServerInstance->SNO.WriteToSnoMask('x', "database: I got a database version (%s) I don't understand", command_p[1].c_str());
 					return false;
 				}