-/* +------------------------------------+
- * | 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 <robin+git@viroteck.net>
+ * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-
-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);
-
- if (loglevel < this->loglvl) return;
-
- 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());
- }
- }
-};
+#include "inspircd.h"
-/* $ModDesc: Logs output to a channel instead of / as well as a file. */
+/* $ModDesc: Logs snomask output to channel(s). */
class ModuleChanLog : public Module
{
private:
- std::vector<ChannelLogStream*> cls;
+ /*
+ * Multimap so people can redirect a snomask to multiple channels.
+ */
+ typedef std::multimap<char, std::string> ChanLogTargets;
+ ChanLogTargets logstreams;
+
public:
- ModuleChanLog(InspIRCd* Me) : Module(Me)
+ void init()
{
+ Implementation eventlist[] = { I_OnRehash, I_OnSendSnotice };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+
+ OnRehash(NULL);
}
virtual ~ModuleChanLog()
{
- std::vector<ChannelLogStream*>::iterator i;
- while ((i = cls.begin()) != cls.end())
- {
- ServerInstance->Logs->DelLogStream(*i);
- cls.erase(i);
- }
}
- virtual void OnReadConfig(ServerConfig* sc, ConfigReader* Conf)
+ virtual void OnRehash(User *user)
{
- /* Since the CloseLogs prior to this hook just wiped out our logstreams for us, we just need to wipe the vector. */
- std::vector<ChannelLogStream*>().swap(cls);
- int index, max = Conf->Enumerate("log");
- cls.reserve(max);
- for (index = 0; index < max; ++index)
+ std::string snomasks;
+ std::string channel;
+
+ logstreams.clear();
+
+ ConfigTagList tags = ServerInstance->Config->ConfTags("chanlog");
+ for (ConfigIter i = tags.first; i != tags.second; ++i)
{
- 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 = i->second->getString("channel");
+ snomasks = i->second->getString("snomasks");
+
+ if (channel.empty() || snomasks.empty())
{
- loglevel = DEFAULT;
+ ServerInstance->Logs->Log("m_chanlog", DEFAULT, "Malformed chanlog tag, ignoring");
+ continue;
}
- else if (level == "sparse")
+
+ for (std::string::const_iterator it = snomasks.begin(); it != snomasks.end(); it++)
{
- loglevel = SPARSE;
+ logstreams.insert(std::make_pair(*it, channel));
+ ServerInstance->Logs->Log("m_chanlog", DEFAULT, "Logging %c to %s", *it, channel.c_str());
}
- else if (level == "none")
+ }
+
+ }
+
+ virtual ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg)
+ {
+ std::pair<ChanLogTargets::const_iterator, ChanLogTargets::const_iterator> 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());
+
+ for (ChanLogTargets::const_iterator it = itpair.first; it != itpair.second; ++it)
+ {
+ Channel *c = ServerInstance->FindChan(it->second);
+ if (c)
{
- loglevel = NONE;
+ c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name.c_str(), buf);
+ ServerInstance->PI->SendChannelPrivmsg(c, 0, buf);
}
- std::string target = Conf->ReadValue("log", "target", index);
- ChannelLogStream* c = new ChannelLogStream(ServerInstance, loglevel, target);
- ServerInstance->Logs->AddLogTypes(type, c, true);
- cls.push_back(c);
}
+
+ return MOD_RES_PASSTHRU;
}
virtual Version GetVersion()
{
- return Version(1,1,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
+
projects / user / henk / code / inspircd.git / blobdiff