X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flogger.cpp;h=e2baa4b8da4137b0434579b8b8a68a40a77865ad;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=05fb801ae76ad951d98f94ef60ee869d0e40b5f8;hpb=51f6fd1cf70e06f04ae50795d41ce9703271462c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/logger.cpp b/src/logger.cpp
index 05fb801ae..e2baa4b8d 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -48,8 +48,8 @@ void LogManager::SetupNoFork()
 {
 	if (!noforkstream)
 	{
-		FileWriter* fw = new FileWriter(ServerInstance, stdout);
-		noforkstream = new FileLogStream(ServerInstance, ServerInstance->Config->forcedebug ? DEBUG : DEFAULT, fw);
+		FileWriter* fw = new FileWriter(stdout);
+		noforkstream = new FileLogStream(ServerInstance->Config->forcedebug ? DEBUG : DEFAULT, fw);
 	}
 	else
 	{
@@ -70,7 +70,7 @@ void LogManager::OpenFileLogs()
 	{
 		return;
 	}
-	ConfigReader* Conf = new ConfigReader(ServerInstance);
+	ConfigReader* Conf = new ConfigReader;
 	std::map<std::string, FileWriter*> logmap;
 	std::map<std::string, FileWriter*>::iterator i;
 	for (int index = 0; index < Conf->Enumerate("log"); ++index)
@@ -109,14 +109,14 @@ void LogManager::OpenFileLogs()
 		if ((i = logmap.find(target)) == 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;
 		}
-		FileLogStream* fls = new FileLogStream(ServerInstance, loglevel, fw);
+		FileLogStream* fls = new FileLogStream(loglevel, fw);
 		AddLogTypes(type, fls, true);
 	}
 }
@@ -330,8 +330,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)
+FileWriter::FileWriter(FILE* logfile)
+: log(logfile), writeops(0)
 {
 }
 
@@ -341,13 +341,15 @@ void FileWriter::HandleEvent(EventType ev, int)
 
 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);
 	}
 }
 
@@ -357,6 +359,7 @@ void FileWriter::Close()
 	{
 		fflush(log);
 		fclose(log);
+		log = NULL;
 	}
 }