X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flogger.cpp;h=b265a8ea67fcbc57206680bf07c880650f491297;hb=b43fc66c17c2bef6dca66a966676b8128d5774ee;hp=d40e366b45082515fcbf7442999d686f3c3fa844;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/logger.cpp b/src/logger.cpp
index d40e366b4..b265a8ea6 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 
 #include "filelogger.h"
@@ -31,7 +29,7 @@
  *
  * How it works:
  *  Modules create their own logstream types (core will create one for 'file logging' for example) and create instances of these logstream types
- *  and register interest in a certain logtype. Globbing is not here, with the exception of * - for all events.. loglevel is used to drop 
+ *  and register interest in a certain logtype. Globbing is not here, with the exception of * - for all events.. loglevel is used to drop
  *  events that are of no interest to a logstream.
  *
  *  When Log is called, the vector of logstreams for that type is iterated (along with the special vector for "*"), and all registered logstreams
@@ -41,52 +39,39 @@
  * NOTE: Somehow we have to let LogManager manage the non-blocking file streams and provide an interface to share them with various LogStreams,
  *       as, for example, a user may want to let 'KILL' and 'XLINE' snotices go to /home/ircd/inspircd/logs/operactions.log, or whatever. How
  *       can we accomplish this easily? I guess with a map of pre-loved logpaths, and a pointer of FILE *..
- * 
+ *
  */
 
-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,19 @@ 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);
+			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,37 +316,31 @@ 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)
 {
 }
 
 void FileWriter::WriteLogLine(const std::string &line)
 {
-	if (log)
+	if (log == NULL)
+		return;
+// XXX: For now, just return. Don't throw an exception. It'd be nice to find out if this is happening, but I'm terrified of breaking so close to final release. -- w00t
+//		throw CoreException("FileWriter::WriteLogLine called with a closed logfile");
+
+	fprintf(log,"%s",line.c_str());
+	if (writeops++ % 20)
 	{
-		fprintf(log,"%s",line.c_str());
-		if (writeops++ % 20)
-		{
-			fflush(log);
-		}
+		fflush(log);
 	}
 }
 
-void FileWriter::Close()
+FileWriter::~FileWriter()
 {
 	if (log)
 	{
 		fflush(log);
 		fclose(log);
+		log = NULL;
 	}
 }
-
-FileWriter::~FileWriter()
-{
-}
-