X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flogger.cpp;h=8c9d9a79bf6dbb5fb797f987f31bb96a73c8d38b;hb=235864add961270140c956647d783fa79b5f7120;hp=19e07e78f64188b5b08e2724ced28d08f853409d;hpb=33141a0825e7cf2dcd0cae63da8943626d8a06b6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/logger.cpp b/src/logger.cpp
index 19e07e78f..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
@@ -44,54 +44,23 @@
 
 LogManager::LogManager()
 {
-	noforkstream = NULL;
 	Logging = false;
 }
 
 LogManager::~LogManager()
 {
-	if (noforkstream)
-	{
-		ServerInstance->Logs = this;
-		delete noforkstream;
-		ServerInstance->Logs = NULL;
-	}
-}
-
-void LogManager::SetupNoFork()
-{
-	if (!noforkstream)
-	{
-		FileWriter* fw = new FileWriter(stdout);
-		noforkstream = new FileLogStream(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;
 	std::map<std::string, FileWriter*> logmap;
-	std::map<std::string, FileWriter*>::iterator i;
-	for (int index = 0;; ++index)
+	ConfigTagList tags = ServerInstance->Config->ConfTags("log");
+	for(ConfigIter i = tags.first; i != tags.second; ++i)
 	{
-		ConfigTag* tag = ServerInstance->Config->ConfValue("log", index);
-		if (!tag)
-			break;
+		ConfigTag* tag = i->second;
 		std::string method = tag->getString("method");
 		if (method != "file")
 		{
@@ -100,10 +69,9 @@ void LogManager::OpenFileLogs()
 		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")
 		{
@@ -122,16 +90,21 @@ 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");
+			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(loglevel, fw);
 		AddLogTypes(type, fls, true);
@@ -352,10 +325,6 @@ FileWriter::FileWriter(FILE* logfile)
 {
 }
 
-void FileWriter::HandleEvent(EventType ev, int)
-{
-}
-
 void FileWriter::WriteLogLine(const std::string &line)
 {
 	if (log == NULL)
@@ -370,7 +339,7 @@ void FileWriter::WriteLogLine(const std::string &line)
 	}
 }
 
-void FileWriter::Close()
+FileWriter::~FileWriter()
 {
 	if (log)
 	{
@@ -379,8 +348,3 @@ void FileWriter::Close()
 		log = NULL;
 	}
 }
-
-FileWriter::~FileWriter()
-{
-	this->Close();
-}