aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/extra
diff options
context:
space:
mode:
authorGravatar Sadie Powell2022-12-18 13:43:33 +0000
committerGravatar Sadie Powell2022-12-18 13:43:33 +0000
commitd8b4414ee18be69eb7c6c491587e4895dc995fac (patch)
tree5aebcbacc529d29c622974df798f4aa42d28f518 /src/modules/extra
parentUpdate /MOTD to match /OPERMOTD. (diff)
Rework the levels things are logged at to make more sense.
Diffstat (limited to 'src/modules/extra')
-rw-r--r--src/modules/extra/m_argon2.cpp2
-rw-r--r--src/modules/extra/m_mysql.cpp6
-rw-r--r--src/modules/extra/m_pgsql.cpp2
-rw-r--r--src/modules/extra/m_sqlite3.cpp2
-rw-r--r--src/modules/extra/m_ssl_gnutls.cpp6
-rw-r--r--src/modules/extra/m_ssl_mbedtls.cpp4
-rw-r--r--src/modules/extra/m_ssl_openssl.cpp4
7 files changed, 13 insertions, 13 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;
}