X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanlog.cpp;h=5070f190a7cac59b4b70fc31e57f05891ba07c6c;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=0a189be7f2485aa954b384a4c9d56b9b713b06bc;hpb=f51d9ad5ab7015f78a29039ca7ed169b281ff6bb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index 0a189be7f..5070f190a 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -26,13 +26,23 @@ class ChannelLogStream : public LogStream
 	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 (loglevel < this->loglvl)
+			return;
+
+		if (Logging)
+			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());
+			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, buf);
+			ServerInstance->PI->SendChannelPrivmsg(c, 0, buf);
+			Logging = false;
 		}
 	}
 };
@@ -42,22 +52,79 @@ class ChannelLogStream : public LogStream
 class ModuleChanLog : public Module
 {
  private:
-	ChannelLogStream *l;
+	std::vector<ChannelLogStream*> cls;
  public:
 	ModuleChanLog(InspIRCd* Me) : Module(Me)
 	{
-		l = new ChannelLogStream(Me, ServerInstance->Config->LogLevel, "#services");
-		Me->Logs->AddLogType("*", l);
+		Implementation eventlist[] = { I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
+
+		OnRehash(NULL, "");
 	}
 
 	virtual ~ModuleChanLog()
 	{
-		delete l;
+		std::vector<ChannelLogStream*>::iterator i;
+		while ((i = cls.begin()) != cls.end())
+		{
+			ServerInstance->Logs->DelLogStream(*i);
+			cls.erase(i);
+		}
+	}
+
+	virtual void OnRehash(User *user, const std::string &parameter)
+	{
+		ConfigReader Conf(ServerInstance);
+
+		/* 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);
+
+
+			//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);
+			ChannelLogStream* c = new ChannelLogStream(ServerInstance, loglevel, target);
+			ServerInstance->Logs->AddLogTypes(type, c, true);
+			cls.push_back(c);
+		}
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 	}
 };