diff options
| author | 2022-01-18 03:10:47 +0000 | |
|---|---|---|
| committer | 2022-05-01 22:07:04 +0100 | |
| commit | c382faf9c941ad2ab93f806b6477933d41566719 (patch) | |
| tree | 9244cf84190cf74d4e16085b2ae9bc9b5520457f /src/modules | |
| parent | Delete the old logging system. (diff) | |
Rewrite the entire logging system.
- Much cleaner API for writing to the log.
- Adds support for stderr and stdout logging to the core.
- Adds support for sql and syslog logging in modules.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/extra/m_log_syslog.cpp | 94 | ||||
| -rw-r--r-- | src/modules/m_log_sql.cpp | 118 |
2 files changed, 212 insertions, 0 deletions
diff --git a/src/modules/extra/m_log_syslog.cpp b/src/modules/extra/m_log_syslog.cpp new file mode 100644 index 000000000..4e9fb864f --- /dev/null +++ b/src/modules/extra/m_log_syslog.cpp @@ -0,0 +1,94 @@ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2022 Sadie Powell <sadie@witchery.services> + * + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + + +#include "inspircd.h" + +#include <syslog.h> + +class SyslogMethod final + : public Log::Method +{ +private: + // Converts an InspIRCd log level to syslog priority. + int LevelToPriority(Log::Level level) + { + switch (level) + { + case Log::Level::ERROR: + return LOG_ERR; + + case Log::Level::WARNING: + return LOG_WARNING; + + case Log::Level::NORMAL: + return LOG_NOTICE; + + case Log::Level::DEBUG: + case Log::Level::RAWIO: + return LOG_DEBUG; + } + + // Should never happen. + return LOG_NOTICE; + } + +public: + void OnLog(Log::Level level, const std::string& type, const std::string& message) override + { + syslog(LevelToPriority(level), "%s: %s", type.c_str(), message.c_str()); + } +}; + +class SyslogEngine final + : public Log::Engine +{ +public: + SyslogEngine(Module* Creator) + : Log::Engine(Creator, "syslog") + { + } + +public: + Log::MethodPtr Create(std::shared_ptr<ConfigTag> tag) override + { + return std::make_shared<SyslogMethod>(); + } +}; + +class ModuleLogSyslog final + : public Module +{ +private: + SyslogEngine engine; + +public: + ModuleLogSyslog() + : Module(VF_VENDOR, "Provides the ability to write logs to syslog.") + , engine(this) + { + openlog("inspircd", LOG_NDELAY|LOG_PID, LOG_USER); + } + + ~ModuleLogSyslog() + { + closelog(); + } +}; + +MODULE_INIT(ModuleLogSyslog) diff --git a/src/modules/m_log_sql.cpp b/src/modules/m_log_sql.cpp new file mode 100644 index 000000000..55e816fda --- /dev/null +++ b/src/modules/m_log_sql.cpp @@ -0,0 +1,118 @@ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2022 Sadie Powell <sadie@witchery.services> + * + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + + +#include "inspircd.h" +#include "modules/sql.h" + +namespace +{ + Module* thismod; +} + +class SQLQuery final + : public SQL::Query +{ +public: + SQLQuery(Module* mod) + : SQL::Query(mod) + { + } + + void OnResult(SQL::Result& res) override + { + // Nothing to do here. + } + + void OnError(SQL::Error& error) override + { + ServerInstance->SNO.WriteGlobalSno('a', "Unable to write to SQL log (query error: %s).", error.ToString()); + } +}; + +class SQLMethod final + : public Log::Method +{ +private: + std::string query; + dynamic_reference<SQL::Provider> sql; + +public: + SQLMethod(const dynamic_reference<SQL::Provider>& s, const std::string& q) + : query(q) + , sql(s) + { + } + + void OnLog(Log::Level level, const std::string& type, const std::string& message) override + { + if (!sql) + { + ServerInstance->SNO.WriteGlobalSno('a', "Unable to write to SQL log (database %s not available).", sql->GetId().c_str()); + return; + } + + SQL::ParamMap params = { + { "level", ConvToStr(static_cast<uint8_t>(level)) }, + { "message", message }, + { "time", ConvToStr(ServerInstance->Time()) }, + { "type", type }, + }; + sql->Submit(new SQLQuery(thismod), query, params); + } +}; + +class SQLEngine final + : public Log::Engine +{ +public: + SQLEngine(Module* Creator) + : Log::Engine(Creator, "sql") + { + } + +public: + Log::MethodPtr Create(std::shared_ptr<ConfigTag> tag) override + { + dynamic_reference<SQL::Provider> sql(creator, "SQL"); + const std::string dbid = tag->getString("dbid"); + if (!dbid.empty()) + sql.SetProvider("SQL/" + dbid); + + const std::string query = tag->getString("query", "INSERT INTO ircd_log (time, type, message) VALUES (FROM_UNIXTIME($time), '$type', '$message');", 1); + return std::make_shared<SQLMethod>(sql, query); + } +}; + +class ModuleLogSQL final + : public Module +{ +private: + SQLEngine engine; + +public: + ModuleLogSQL() + : Module(VF_VENDOR, "Provides the ability to write logs to an SQL database.") + , engine(this) + { + thismod = this; + } + +}; + +MODULE_INIT(ModuleLogSQL) |
