X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanlog.cpp;h=4bfce210837a8d9c331cff3cda365892251df3d3;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=bb5adf67c32f2e34253cdbd6cda1b1419ccba0c9;hpb=d0be7981e62a73d71cf9ffe534b245584aa27a36;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp index bb5adf67c..4bfce2108 100644 --- a/src/modules/m_chanlog.cpp +++ b/src/modules/m_chanlog.cpp @@ -1,152 +1,152 @@ -/* +------------------------------------+ - * | 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) 2008 Robin Burchell + * Copyright (C) 2008 Thomas Stagner * - * 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. * - * --------------------------------------------------- - */ - -#include "inspircd.h" - -/* $ModDesc: Logs snomask output to channel(s). */ - -/* - * This is for the "old" chanlog module which intercepted messages going to the logfile.. - * I don't consider it all that useful, and it's quite dangerous if setup incorrectly, so - * this is defined out but left intact in case someone wants to develop it further someday. + * 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. * - * -- w00t (aug 23rd, 2008) + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#define OLD_CHANLOG 0 - -#if OLD_CHANLOG -class ChannelLogStream : public LogStream -{ - private: - std::string channel; - - public: - ChannelLogStream(InspIRCd *Instance, int loglevel, const std::string &chan) : LogStream(Instance, loglevel), channel(chan) - { - } - virtual void OnLog(int loglevel, const std::string &type, const std::string &msg) - { - Channel *c = ServerInstance->FindChan(channel); - static bool Logging = false; - if (loglevel < this->loglvl) - return; - - if (Logging) - return; - - if (c) - { - Logging = true; // this avoids (rare chance) loops with logging server IO on networks - char buf[MAXBUF]; - snprintf(buf, MAXBUF, "\2%s\2: %s", type.c_str(), msg.c_str()); +#include "inspircd.h" - c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name.c_str(), buf); - ServerInstance->PI->SendChannelPrivmsg(c, 0, buf); - Logging = false; - } - } -}; -#endif +/* $ModDesc: Logs snomask output to channel(s). */ class ModuleChanLog : public Module { - private: /* * Multimap so people can redirect a snomask to multiple channels. */ - std::multimap logstreams; + typedef std::multimap ChanLogTargets; + ChanLogTargets logstreams; public: - ModuleChanLog(InspIRCd* Me) : Module(Me) + void init() { Implementation eventlist[] = { I_OnRehash, I_OnSendSnotice }; - ServerInstance->Modules->Attach(eventlist, this, 2); + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); - OnRehash(NULL, ""); + OnRehash(NULL); } - virtual ~ModuleChanLog() + virtual void OnRehash(User *user) { - } - - virtual void OnRehash(User *user, const std::string ¶meter) - { - ConfigReader MyConf(ServerInstance); std::string snomasks; std::string channel; logstreams.clear(); - for (int i = 0; i < MyConf.Enumerate("chanlog"); i++) + ConfigTagList tags = ServerInstance->Config->ConfTags("chanlog"); + for (ConfigIter i = tags.first; i != tags.second; ++i) { - channel = MyConf.ReadValue("chanlog", "channel", i); - snomasks = MyConf.ReadValue("chanlog", "snomasks", i); + channel = i->second->getString("channel"); + snomasks = i->second->getString("snomasks"); if (channel.empty() || snomasks.empty()) { - ServerInstance->Logs->Log("m_chanlog", DEFAULT, "Malformed chanlog tag, ignoring"); + ServerInstance->Logs->Log("m_chanlog", LOG_DEFAULT, "Malformed chanlog tag, ignoring"); continue; } - for (std::string::const_iterator it = snomasks.begin(); it != snomasks.end(); i++) + for (std::string::const_iterator it = snomasks.begin(); it != snomasks.end(); it++) { logstreams.insert(std::make_pair(*it, channel)); - ServerInstance->Logs->Log("m_chanlog", DEFAULT, "Logging %c to %s", *it, channel.c_str()); - it++; + ServerInstance->Logs->Log("m_chanlog", LOG_DEFAULT, "Logging %c to %s", *it, channel.c_str()); } } } - virtual int OnSendSnotice(char &sno, std::string &desc, const std::string &msg) + virtual ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg) { - std::multimap::const_iterator it = logstreams.find(sno); - char buf[MAXBUF]; - - if (it == logstreams.end()) - return 0; + std::pair itpair = logstreams.equal_range(sno); + if (itpair.first == itpair.second) + return MOD_RES_PASSTHRU; + char buf[MAXBUF]; snprintf(buf, MAXBUF, "\2%s\2: %s", desc.c_str(), msg.c_str()); - while (it != logstreams.end()) + for (ChanLogTargets::const_iterator it = itpair.first; it != itpair.second; ++it) { - if (it->first != sno) - { - it++; - continue; - } - Channel *c = ServerInstance->FindChan(it->second); if (c) { c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name.c_str(), buf); ServerInstance->PI->SendChannelPrivmsg(c, 0, buf); } - - it++; } - return 0; + return MOD_RES_PASSTHRU; } virtual Version GetVersion() { - return Version(1,2,0,1,VF_VENDOR,API_VERSION); + return Version("Logs snomask output to channel(s).", VF_VENDOR); } }; MODULE_INIT(ModuleChanLog) + + + + + + + + +/* + * This is for the "old" chanlog module which intercepted messages going to the logfile.. + * I don't consider it all that useful, and it's quite dangerous if setup incorrectly, so + * this is defined out but left intact in case someone wants to develop it further someday. + * + * -- w00t (aug 23rd, 2008) + */ +#define OLD_CHANLOG 0 + +#if OLD_CHANLOG +class ChannelLogStream : public LogStream +{ + private: + std::string channel; + + public: + ChannelLogStream(int loglevel, const std::string &chan) : LogStream(loglevel), channel(chan) + { + } + + virtual void OnLog(int loglevel, const std::string &type, const std::string &msg) + { + Channel *c = ServerInstance->FindChan(channel); + static bool Logging = false; + + if (loglevel < this->loglvl) + return; + + if (Logging) + return; + + if (c) + { + Logging = true; // this avoids (rare chance) loops with logging server IO on networks + char buf[MAXBUF]; + snprintf(buf, MAXBUF, "\2%s\2: %s", type.c_str(), msg.c_str()); + + c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name.c_str(), buf); + ServerInstance->PI->SendChannelPrivmsg(c, 0, buf); + Logging = false; + } + } +}; +#endif