X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanlog.cpp;h=18d13ecdf8bfe222607c0775c3db43c7d36f96d9;hb=97c0e6b4c4e304a1c4e764fc06a7e2663a41743d;hp=f1553ccea3c01a424989ce8ac9d251bc48666b27;hpb=f63580a4eaa8d079200065dffa4d6a33b5577427;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index f1553ccea..18d13ecdf 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -2,8 +2,8 @@
  *       | 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.
@@ -13,55 +13,147 @@
 
 #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(InspIRCd* Me) : Module(Me)
 	{
+		Implementation eventlist[] = { I_OnRehash, I_OnSendSnotice };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
+
+		OnRehash(NULL, "");
 	}
 
-	virtual void OnLog(int loglevel, const std::string &type, const std::string &msg)
+	virtual ~ModuleChanLog()
 	{
-		Channel *c = ServerInstance->FindChan(channel);
+	}
 
-		if (loglevel < this->loglvl) return;
+	virtual void OnRehash(User *user, const std::string &parameter)
+	{
+		ConfigReader MyConf(ServerInstance);
+		std::string snomasks;
+		std::string channel;
 
-		if (c)
+		logstreams.clear();
+
+		for (int i = 0; i < MyConf.Enumerate("chanlog"); i++)
 		{
-			// 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());
+			channel = MyConf.ReadValue("chanlog", "channel", i);
+			snomasks = MyConf.ReadValue("chanlog", "snomasks", i);
+
+			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());
+			}
 		}
+
+	}
+
+	virtual int OnSendSnotice(char &sno, std::string &desc, const std::string &msg)
+	{
+		std::multimap<char, std::string>::const_iterator it = logstreams.find(sno);
+		char buf[MAXBUF];
+
+		if (it == logstreams.end())
+			return 0;
+
+		snprintf(buf, MAXBUF, "\2%s\2: %s", desc.c_str(), msg.c_str());
+
+		while (it != logstreams.end())
+		{
+			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;
+	}
+
+	virtual Version GetVersion()
+	{
+		return Version("$Id$", VF_VENDOR,API_VERSION);
 	}
 };
 
-/* $ModDesc: Logs output to a channel instead of / as well as a file. */
 
-class ModuleChanLog : public Module
+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:
-	InspIRCd *ServerInstance;
-	ChannelLogStream *l;
+	std::string channel;
+
  public:
-	ModuleChanLog(InspIRCd* Me) : Module(Me)
+	ChannelLogStream(InspIRCd *Instance, int loglevel, const std::string &chan) : LogStream(Instance, loglevel), channel(chan)
 	{
-		l = new ChannelLogStream(Me, ServerInstance->Config->LogLevel, "#services");
-		Me->Logs->AddLogType("*", l);
 	}
 
-	virtual ~ModuleChanLog()
+	virtual void OnLog(int loglevel, const std::string &type, const std::string &msg)
 	{
-		delete l;
-	}
+		Channel *c = ServerInstance->FindChan(channel);
+		static bool Logging = false;
 
-	virtual Version GetVersion()
-	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
-	}
-};
+		if (loglevel < this->loglvl)
+			return;
 
+		if (Logging)
+			return;
 
-MODULE_INIT(ModuleChanLog)
+		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