From 16ca76c2e7ab287e480185fbb03a0bb438351eda Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 23 Jan 2017 12:35:14 -0500 Subject: Make log system use newer format strings Also allow log messages to be translatable --- modules/extra/stats/chanstats.cpp | 12 ++++++------ modules/extra/stats/cs_fantasy_stats.cpp | 6 +++--- modules/extra/stats/cs_fantasy_top.cpp | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'modules/extra/stats') diff --git a/modules/extra/stats/chanstats.cpp b/modules/extra/stats/chanstats.cpp index 65a198449..adc002c8c 100644 --- a/modules/extra/stats/chanstats.cpp +++ b/modules/extra/stats/chanstats.cpp @@ -34,11 +34,11 @@ class CommandCSSetChanstats : public Command { ci->Extend("CS_STATS"); source.Reply(_("Chanstats statistics are now enabled for this channel.")); - Log(source.AccessFor(ci).HasPriv("SET") ? LOG_COMMAND : LOG_OVERRIDE, source, this, ci) << "to enable chanstats"; + Log(source.AccessFor(ci).HasPriv("SET") ? LogType::COMMAND : LogType::OVERRIDE, source, this, ci) << "to enable chanstats"; } else if (params[1].equals_ci("OFF")) { - Log(source.AccessFor(ci).HasPriv("SET") ? LOG_COMMAND : LOG_OVERRIDE, source, this, ci) << "to disable chanstats"; + Log(source.AccessFor(ci).HasPriv("SET") ? LogType::COMMAND : LogType::OVERRIDE, source, this, ci) << "to disable chanstats"; ci->Shrink("CS_STATS"); source.Reply(_("Chanstats statistics are now disabled for this channel.")); } @@ -79,7 +79,7 @@ class CommandNSSetChanstats : public Command if (param.equals_ci("ON")) { - Log(na->GetAccount() == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to enable chanstats for " << na->GetAccount()->GetDisplay(); + Log(na->GetAccount() == source.GetAccount() ? LogType::COMMAND : LogType::ADMIN, source, this) << "to enable chanstats for " << na->GetAccount()->GetDisplay(); na->GetAccount()->Extend("NS_STATS"); if (saset) source.Reply(_("Chanstats statistics are now enabled for %s"), na->GetAccount()->GetDisplay().c_str()); @@ -88,7 +88,7 @@ class CommandNSSetChanstats : public Command } else if (param.equals_ci("OFF")) { - Log(na->GetAccount() == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to disable chanstats for " << na->GetAccount()->GetDisplay(); + Log(na->GetAccount() == source.GetAccount() ? LogType::COMMAND : LogType::ADMIN, source, this) << "to disable chanstats for " << na->GetAccount()->GetDisplay(); na->GetAccount()->Shrink("NS_STATS"); if (saset) source.Reply(_("Chanstats statistics are now disabled for %s"), na->GetAccount()->GetDisplay().c_str()); @@ -148,9 +148,9 @@ class MySQLInterface : public SQL::Interface void OnError(const SQL::Result &r) override { if (!r.GetQuery().query.empty()) - Log(LOG_DEBUG) << "Chanstats: Error executing query " << r.finished_query << ": " << r.GetError(); + Log(LogType::DEBUG) << "Chanstats: Error executing query " << r.finished_query << ": " << r.GetError(); else - Log(LOG_DEBUG) << "Chanstats: Error executing query: " << r.GetError(); + Log(LogType::DEBUG) << "Chanstats: Error executing query: " << r.GetError(); } }; diff --git a/modules/extra/stats/cs_fantasy_stats.cpp b/modules/extra/stats/cs_fantasy_stats.cpp index 78dce14f1..1cbc4cd15 100644 --- a/modules/extra/stats/cs_fantasy_stats.cpp +++ b/modules/extra/stats/cs_fantasy_stats.cpp @@ -24,9 +24,9 @@ class MySQLInterface : public SQL::Interface void OnError(const SQL::Result &r) override { if (!r.GetQuery().query.empty()) - Log(LOG_DEBUG) << "Chanstats: Error executing query " << r.finished_query << ": " << r.GetError(); + Log(LogType::DEBUG) << "Chanstats: Error executing query " << r.finished_query << ": " << r.GetError(); else - Log(LOG_DEBUG) << "Chanstats: Error executing query: " << r.GetError(); + Log(LogType::DEBUG) << "Chanstats: Error executing query: " << r.GetError(); } }; @@ -157,7 +157,7 @@ class CSStats : public Module } catch (const SQL::Exception &ex) { - Log(LOG_DEBUG) << ex.GetReason(); + Log(LogType::DEBUG) << ex.GetReason(); } } diff --git a/modules/extra/stats/cs_fantasy_top.cpp b/modules/extra/stats/cs_fantasy_top.cpp index 961b2f903..2be1d2f1c 100644 --- a/modules/extra/stats/cs_fantasy_top.cpp +++ b/modules/extra/stats/cs_fantasy_top.cpp @@ -24,9 +24,9 @@ class MySQLInterface : public SQL::Interface void OnError(const SQL::Result &r) override { if (!r.GetQuery().query.empty()) - Log(LOG_DEBUG) << "Chanstats: Error executing query " << r.finished_query << ": " << r.GetError(); + Log(LogType::DEBUG) << "Chanstats: Error executing query " << r.finished_query << ": " << r.GetError(); else - Log(LOG_DEBUG) << "Chanstats: Error executing query: " << r.GetError(); + Log(LogType::DEBUG) << "Chanstats: Error executing query: " << r.GetError(); } }; @@ -160,7 +160,7 @@ class CSTop : public Module } catch (const SQL::Exception &ex) { - Log(LOG_DEBUG) << ex.GetReason(); + Log(LogType::DEBUG) << ex.GetReason(); } } }; -- cgit