From bd517c7e44d1ad800e59f305aafe4e0e6dce04d0 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 28 Nov 2021 21:17:22 +0000 Subject: Add a snomask flag for rehash messages. --- src/modules/extra/m_ssl_gnutls.cpp | 4 ++-- src/modules/extra/m_ssl_mbedtls.cpp | 4 ++-- src/modules/extra/m_ssl_openssl.cpp | 4 ++-- src/modules/extra/m_sslrehashsignal.cpp | 2 +- src/modules/m_rline.cpp | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/modules') diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 174647e92..bbadc7226 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -1174,11 +1174,11 @@ class ModuleSSLGnuTLS final try { ReadProfiles(); - ServerInstance->SNO.WriteToSnoMask('a', "GnuTLS TLS profiles have been reloaded."); + ServerInstance->SNO.WriteToSnoMask('r', "GnuTLS TLS profiles have been reloaded."); } catch (ModuleException& ex) { - ServerInstance->SNO.WriteToSnoMask('a', "Failed to reload the GnuTLS TLS (SSL) profiles. " + ex.GetReason()); + ServerInstance->SNO.WriteToSnoMask('r', "Failed to reload the GnuTLS TLS (SSL) profiles. " + ex.GetReason()); } } diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp index 8d87f817a..91d67bcb3 100644 --- a/src/modules/extra/m_ssl_mbedtls.cpp +++ b/src/modules/extra/m_ssl_mbedtls.cpp @@ -947,11 +947,11 @@ class ModuleSSLmbedTLS final try { ReadProfiles(); - ServerInstance->SNO.WriteToSnoMask('a', "mbedTLS TLS profiles have been reloaded."); + ServerInstance->SNO.WriteToSnoMask('r', "mbedTLS TLS profiles have been reloaded."); } catch (ModuleException& ex) { - ServerInstance->SNO.WriteToSnoMask('a', "Failed to reload the mbedTLS TLS profiles. " + ex.GetReason()); + ServerInstance->SNO.WriteToSnoMask('r', "Failed to reload the mbedTLS TLS profiles. " + ex.GetReason()); } } diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index fdaea2ff3..e70046ea4 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -1006,11 +1006,11 @@ class ModuleSSLOpenSSL final try { ReadProfiles(); - ServerInstance->SNO.WriteToSnoMask('a', "OpenSSL TLS profiles have been reloaded."); + ServerInstance->SNO.WriteToSnoMask('r', "OpenSSL TLS profiles have been reloaded."); } catch (ModuleException& ex) { - ServerInstance->SNO.WriteToSnoMask('a', "Failed to reload the OpenSSL TLS (SSL) profiles. " + ex.GetReason()); + ServerInstance->SNO.WriteToSnoMask('r', "Failed to reload the OpenSSL TLS (SSL) profiles. " + ex.GetReason()); } } diff --git a/src/modules/extra/m_sslrehashsignal.cpp b/src/modules/extra/m_sslrehashsignal.cpp index 25ceec023..d975be453 100644 --- a/src/modules/extra/m_sslrehashsignal.cpp +++ b/src/modules/extra/m_sslrehashsignal.cpp @@ -53,7 +53,7 @@ class ModuleSSLRehashSignal final return; const std::string feedbackmsg = "Got SIGUSR1, reloading TLS credentials"; - ServerInstance->SNO.WriteGlobalSno('a', feedbackmsg); + ServerInstance->SNO.WriteGlobalSno('r', feedbackmsg); ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, feedbackmsg); const std::string str = "tls"; diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 78a94cbbb..e52224738 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -265,15 +265,15 @@ class ModuleRLine final if (!rxfactory) { if (newrxengine.empty()) - ServerInstance->SNO.WriteToSnoMask('a', "WARNING: No regex engine loaded - R-line functionality disabled until this is corrected."); + ServerInstance->SNO.WriteToSnoMask('r', "WARNING: No regex engine loaded - R-line functionality disabled until this is corrected."); else - ServerInstance->SNO.WriteToSnoMask('a', "WARNING: Regex engine '%s' is not loaded - R-line functionality disabled until this is corrected.", newrxengine.c_str()); + ServerInstance->SNO.WriteToSnoMask('r', "WARNING: Regex engine '%s' is not loaded - R-line functionality disabled until this is corrected.", newrxengine.c_str()); ServerInstance->XLines->DelAll(f.GetType()); } else if ((!initing) && (rxfactory.operator->() != factory)) { - ServerInstance->SNO.WriteToSnoMask('a', "Regex engine has changed, removing all R-lines."); + ServerInstance->SNO.WriteToSnoMask('r', "Regex engine has changed, removing all R-lines."); ServerInstance->XLines->DelAll(f.GetType()); } -- cgit v1.3.1-10-gc9f91