X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanlog.cpp;h=c80b4691cf9e8097f2f1ce582178235566cb7818;hb=fe41ae3e8194d531e6e7427ec30d3fb58871498c;hp=68a34998132d06f9ede373f34eb91278983a04e7;hpb=4507fa2302b7dd0a8f6f0a43d9b46f6c21bf3345;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp index 68a349981..c80b4691c 100644 --- a/src/modules/m_chanlog.cpp +++ b/src/modules/m_chanlog.cpp @@ -1,115 +1,94 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2018 linuxdaemon + * Copyright (C) 2013, 2018 Sadie Powell + * Copyright (C) 2012-2014, 2018 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2010 Craig Edwards + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2008 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 . */ + #include "inspircd.h" -class ChannelLogStream : public LogStream +class ModuleChanLog : public Module { - private: - std::string channel; + /* + * Multimap so people can redirect a snomask to multiple channels. + */ + typedef insp::flat_multimap ChanLogTargets; + ChanLogTargets logstreams; public: - ChannelLogStream(InspIRCd *Instance, int loglevel, const std::string &chan) : LogStream(Instance, loglevel), channel(chan) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - } + std::string snomasks; + std::string channel; + ChanLogTargets newlogs; - virtual void OnLog(int loglevel, const std::string &type, const std::string &msg) - { - Channel *c = ServerInstance->FindChan(channel); + ConfigTagList tags = ServerInstance->Config->ConfTags("chanlog"); + for (ConfigIter i = tags.first; i != tags.second; ++i) + { + channel = i->second->getString("channel"); + snomasks = i->second->getString("snomasks"); - if (loglevel < this->loglvl) return; + if (channel.empty() || snomasks.empty()) + { + throw ModuleException("Malformed chanlog tag at " + i->second->getTagLocation()); + } - if (c) - { - // So this won't work remotely. Oh well. - c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :\2%s\2: %s", c->name, type.c_str(), msg.c_str()); + for (std::string::const_iterator it = snomasks.begin(); it != snomasks.end(); it++) + { + newlogs.insert(std::make_pair(*it, channel)); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Logging %c to %s", *it, channel.c_str()); + } } - } -}; - -/* $ModDesc: Logs output to a channel instead of / as well as a file. */ + logstreams.swap(newlogs); -class ModuleChanLog : public Module -{ - private: - std::vector cls; - public: - ModuleChanLog(InspIRCd* Me) : Module(Me) - { } - virtual ~ModuleChanLog() + ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg) CXX11_OVERRIDE { - std::vector::iterator i; - while ((i = cls.begin()) != cls.end()) - { - ServerInstance->Logs->DelLogStream(*i); - cls.erase(i); - } - } + std::pair itpair = logstreams.equal_range(sno); + if (itpair.first == itpair.second) + return MOD_RES_PASSTHRU; - virtual void OnReadConfig(ServerConfig* sc, ConfigReader* Conf) - { - /* Since the CloseLogs prior to this hook just wiped out our logstreams for us, we just need to wipe the vector. */ - std::vector().swap(cls); - int index, max = Conf->Enumerate("log"); - cls.reserve(max); - for (index = 0; index < max; ++index) + const std::string snotice = "\002" + desc + "\002: " + msg; + + for (ChanLogTargets::const_iterator it = itpair.first; it != itpair.second; ++it) { - std::string method = Conf->ReadValue("log", "method", index); - if (method != "file") continue; - std::string type = Conf->ReadValue("log", "type", index); - std::string level = Conf->ReadValue("log", "level", index); - int loglevel = DEFAULT; - if (level == "debug") - { - loglevel = DEBUG; - ServerInstance->Config->debugging = true; - } - else if (level == "verbose") - { - loglevel = VERBOSE; - } - else if (level == "default") + Channel *c = ServerInstance->FindChan(it->second); + if (c) { - loglevel = DEFAULT; + ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->Config->ServerName, c, snotice); + c->Write(ServerInstance->GetRFCEvents().privmsg, privmsg); + ServerInstance->PI->SendMessage(c, 0, snotice); } - else if (level == "sparse") - { - loglevel = SPARSE; - } - else if (level == "none") - { - loglevel = NONE; - } - std::string target = Conf->ReadValue("log", "target", index); - ChannelLogStream* c = new ChannelLogStream(ServerInstance, loglevel, target); - irc::spacesepstream css(type); - std::string tok; - while (css.GetToken(tok)) - { - ServerInstance->Logs->AddLogType(tok, c, true); - } - cls.push_back(c); } + + return MOD_RES_PASSTHRU; } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + return Version("Allows messages sent to snomasks to be logged to a channel.", VF_VENDOR); } }; - MODULE_INIT(ModuleChanLog) -