* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
#include "inspircd.h"
-class ChannelLogStream : public LogStream
+/* $ModDesc: Logs snomask output to channel(s). */
+
+class ModuleChanLog : public Module
{
private:
- std::string channel;
+ /*
+ * Multimap so people can redirect a snomask to multiple channels.
+ */
+ std::multimap<char, std::string> logstreams;
public:
- ChannelLogStream(InspIRCd *Instance, int loglevel, const std::string &chan) : LogStream(Instance, loglevel), channel(chan)
+ ModuleChanLog() {
+ Implementation eventlist[] = { I_OnRehash, I_OnSendSnotice };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
+
+ OnRehash(NULL);
+ }
+
+ virtual ~ModuleChanLog()
{
}
- virtual void OnLog(int loglevel, const std::string &type, const std::string &msg)
+ virtual void OnRehash(User *user)
{
- Channel *c = ServerInstance->FindChan(channel);
+ ConfigReader MyConf;
+ std::string snomasks;
+ std::string channel;
-printf("I got called\n");
- if (loglevel < this->loglvl)
- return;
+ logstreams.clear();
- if (c)
+ for (int i = 0; i < MyConf.Enumerate("chanlog"); i++)
{
- char buf[MAXBUF];
- snprintf(buf, MAXBUF, "\2%s\2: %s", type.c_str(), msg.c_str());
+ channel = MyConf.ReadValue("chanlog", "channel", i);
+ snomasks = MyConf.ReadValue("chanlog", "snomasks", i);
- c->WriteChannelWithServ(ServerInstance->Config->ServerName, "PRIVMSG %s :%s", c->name, buf);
- ServerInstance->PI->SendChannelPrivmsg(c, 0, buf);
+ if (channel.empty() || snomasks.empty())
+ {
+ ServerInstance->Logs->Log("m_chanlog", DEFAULT, "Malformed chanlog tag, ignoring");
+ continue;
+ }
+
+ 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());
+ }
}
- }
-};
-/* $ModDesc: Logs output to a channel instead of / as well as a file. */
+ }
-class ModuleChanLog : public Module
-{
- private:
- std::vector<ChannelLogStream*> cls;
- public:
- ModuleChanLog(InspIRCd* Me) : Module(Me)
+ virtual ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg)
{
- Implementation eventlist[] = { I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, this, 1);
+ std::multimap<char, std::string>::const_iterator it = logstreams.find(sno);
+ char buf[MAXBUF];
- OnRehash(NULL, "");
- }
+ if (it == logstreams.end())
+ return MOD_RES_PASSTHRU;
- virtual ~ModuleChanLog()
- {
- std::vector<ChannelLogStream*>::iterator i;
- while ((i = cls.begin()) != cls.end())
+ snprintf(buf, MAXBUF, "\2%s\2: %s", desc.c_str(), msg.c_str());
+
+ while (it != logstreams.end())
{
- ServerInstance->Logs->DelLogStream(*i);
- cls.erase(i);
+ 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 MOD_RES_PASSTHRU;
}
- virtual void OnRehash(User *user, const std::string ¶meter)
+ virtual Version GetVersion()
{
- ConfigReader Conf(ServerInstance);
+ return Version("Logs snomask output to channel(s).", VF_VENDOR,API_VERSION);
+ }
+};
- /* 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 method = Conf.ReadValue("log", "method", index);
+MODULE_INIT(ModuleChanLog)
- //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")
- {
- loglevel = DEFAULT;
- }
- else if (level == "sparse")
- {
- loglevel = SPARSE;
- }
- else if (level == "none")
- {
- loglevel = NONE;
- }
- std::string target = Conf.ReadValue("log", "target", index);
-printf("looking at tag with method: %s type: %s level: %s target: %s", method.c_str(), type.c_str(), level.c_str(), target.c_str());
- ChannelLogStream* c = new ChannelLogStream(ServerInstance, loglevel, target);
- ServerInstance->Logs->AddLogTypes(type, c, true);
- cls.push_back(c);
- }
- }
- virtual Version GetVersion()
+
+/*
+ * 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)
{
- return Version(1,2,0,1,VF_VENDOR,API_VERSION);
}
-};
+ virtual void OnLog(int loglevel, const std::string &type, const std::string &msg)
+ {
+ Channel *c = ServerInstance->FindChan(channel);
+ static bool Logging = false;
-MODULE_INIT(ModuleChanLog)
+ 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