X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanlog.cpp;h=2a4535fa52eddbe3ac1957cf067db55accd0596d;hb=ccd95e668a3bcbd26c4cd2984cdd8809347f9815;hp=a0d3da4dcd8fbf2e7c0737547f7314b331f078ae;hpb=1df212127427f88b502a5f1030fd2e0a31bd499e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index a0d3da4dc..2a4535fa5 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -17,16 +17,18 @@ class ChannelLogStream : public LogStream
 {
  private:
 	std::string channel;
-	
+
  public:
-	ChannelLogStream(InspIRCd *Instance, const std::string &chan) : LogStream(Instance), channel(chan)
+	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.
@@ -40,20 +42,63 @@ class ChannelLogStream : public LogStream
 class ModuleChanLog : public Module
 {
  private:
-	InspIRCd *ServerInstance;
-	ChannelLogStream *l;
+	std::vector<ChannelLogStream*> cls;
  public:
 	ModuleChanLog(InspIRCd* Me) : Module(Me)
 	{
-		l = new ChannelLogStream(Me, "#services");
-		Me->Logs->AddLogType("*", l);
 	}
-	
+
 	virtual ~ModuleChanLog()
 	{
-		delete l;
+		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)
+	{
+		/* 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);