X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flogger.cpp;h=8c9d9a79bf6dbb5fb797f987f31bb96a73c8d38b;hb=55d96bd075818e6da81e91ebd82cd938ec0908b2;hp=049b4b5e7aa0883ca48fa77af7f4f3afdba443b1;hpb=5bac24a5b0db1f6dfadb997f34c627c6c6d08912;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/logger.cpp b/src/logger.cpp
index 049b4b5e7..8c9d9a79b 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 
 #include "filelogger.h"
@@ -44,49 +42,36 @@
  *
  */
 
-void LogManager::SetupNoFork()
+LogManager::LogManager()
+{
+	Logging = false;
+}
+
+LogManager::~LogManager()
 {
-	if (!noforkstream)
-	{
-		FileWriter* fw = new FileWriter(ServerInstance, stdout);
-		noforkstream = new FileLogStream(ServerInstance, ServerInstance->Config->forcedebug ? DEBUG : DEFAULT, fw);
-	}
-	else
-	{
-		noforkstream->ChangeLevel(ServerInstance->Config->forcedebug ? DEBUG : DEFAULT);
-	}
-	AddLogType("*", noforkstream, false);
 }
 
 void LogManager::OpenFileLogs()
 {
-	/* Re-register the nofork stream if necessary. */
-	if (ServerInstance->Config->nofork)
-	{
-		SetupNoFork();
-	}
 	/* Skip rest of logfile opening if we are running -nolog. */
-	if (!ServerInstance->Config->writelog)
-	{
+	if (!ServerInstance->Config->cmdline.writelog)
 		return;
-	}
-	ConfigReader* Conf = new ConfigReader(ServerInstance);
 	std::map<std::string, FileWriter*> logmap;
-	std::map<std::string, FileWriter*>::iterator i;
-	for (int index = 0; index < Conf->Enumerate("log"); ++index)
+	ConfigTagList tags = ServerInstance->Config->ConfTags("log");
+	for(ConfigIter i = tags.first; i != tags.second; ++i)
 	{
-		std::string method = Conf->ReadValue("log", "method", index);
+		ConfigTag* tag = i->second;
+		std::string method = tag->getString("method");
 		if (method != "file")
 		{
 			continue;
 		}
-		std::string type = Conf->ReadValue("log", "type", index);
-		std::string level = Conf->ReadValue("log", "level", index);
+		std::string type = tag->getString("type");
+		std::string level = tag->getString("level");
 		int loglevel = DEFAULT;
-		if (level == "debug" || ServerInstance->Config->forcedebug)
+		if (level == "debug")
 		{
 			loglevel = DEBUG;
-			ServerInstance->Config->debugging = true;
 		}
 		else if (level == "verbose")
 		{
@@ -105,18 +90,23 @@ void LogManager::OpenFileLogs()
 			loglevel = NONE;
 		}
 		FileWriter* fw;
-		std::string target = Conf->ReadValue("log", "target", index);
-		if ((i = logmap.find(target)) == logmap.end())
+		std::string target = tag->getString("target");
+		std::map<std::string, FileWriter*>::iterator fwi = logmap.find(target);
+		if (fwi == logmap.end())
 		{
-			FILE* f = fopen(target.c_str(), "a");
-			fw = new FileWriter(ServerInstance, f);
+			char realtarget[MAXBUF];
+			time_t time = ServerInstance->Time();
+			struct tm *mytime = gmtime(&time);
+			strftime(realtarget, MAXBUF, target.c_str(), mytime);
+			FILE* f = fopen(realtarget, "a");
+			fw = new FileWriter(f);
 			logmap.insert(std::make_pair(target, fw));
 		}
 		else
 		{
-			fw = i->second;
+			fw = fwi->second;
 		}
-		FileLogStream* fls = new FileLogStream(ServerInstance, loglevel, fw);
+		FileLogStream* fls = new FileLogStream(loglevel, fw);
 		AddLogTypes(type, fls, true);
 	}
 }
@@ -330,12 +320,8 @@ void LogManager::Log(const std::string &type, int loglevel, const std::string &m
 }
 
 
-FileWriter::FileWriter(InspIRCd* Instance, FILE* logfile)
-: ServerInstance(Instance), log(logfile), writeops(0)
-{
-}
-
-void FileWriter::HandleEvent(EventType ev, int)
+FileWriter::FileWriter(FILE* logfile)
+: log(logfile), writeops(0)
 {
 }
 
@@ -353,7 +339,7 @@ void FileWriter::WriteLogLine(const std::string &line)
 	}
 }
 
-void FileWriter::Close()
+FileWriter::~FileWriter()
 {
 	if (log)
 	{
@@ -362,8 +348,3 @@ void FileWriter::Close()
 		log = NULL;
 	}
 }
-
-FileWriter::~FileWriter()
-{
-	this->Close();
-}