X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flogger.cpp;h=c8d7e8b398de350e03c1f29e57e8c973f9c2089a;hb=8c2d96013084de950e3a63be4ae6ed626c4093ab;hp=20235a826030ebc315d85a5e03de565e9003b470;hpb=e3df3b9d267cb3839db268ff6d0be389c45ebf6d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/logger.cpp b/src/logger.cpp
index 20235a826..c8d7e8b39 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -49,11 +49,11 @@ void LogManager::SetupNoFork()
 	if (!noforkstream)
 	{
 		FileWriter* fw = new FileWriter(ServerInstance, stdout);
-		noforkstream = new FileLogStream(ServerInstance, ServerInstance->Config->forcedebug ? DEBUG : ServerInstance->Config->LogLevel, fw);
+		noforkstream = new FileLogStream(ServerInstance, ServerInstance->Config->forcedebug ? DEBUG : DEFAULT, fw);
 	}
 	else
 	{
-		noforkstream->ChangeLevel(ServerInstance->Config->forcedebug ? DEBUG : ServerInstance->Config->LogLevel);
+		noforkstream->ChangeLevel(ServerInstance->Config->forcedebug ? DEBUG : DEFAULT);
 	}
 	AddLogType("*", noforkstream, false);
 }
@@ -333,57 +333,17 @@ 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)
 {
-	if (log)
-	{
-		Instance->SE->NonBlocking(fileno(log));
-		SetFd(fileno(log));
-		buffer.clear();
-	}
 }
 
-bool FileWriter::Readable()
+void FileWriter::HandleEvent(EventType ev, int)
 {
-	return false;
-}
-
-void FileWriter::HandleEvent(EventType, int)
-{
-	WriteLogLine("");
-	if (log)
-	{
-		ServerInstance->SE->DelFd(this);
-	}
 }
 
 void FileWriter::WriteLogLine(const std::string &line)
 {
-	if (line.length())
-	{
-		buffer.append(line);
-	}
-
 	if (log)
 	{
-		int written = fprintf(log,"%s",buffer.c_str());
-#ifdef WINDOWS
-		buffer.clear();
-#else
-		if ((written >= 0) && (written < (int)buffer.length()))
-		{
-			buffer.erase(0, buffer.length());
-			ServerInstance->SE->AddFd(this);
-		}
-		else if (written == -1)
-		{
-			if (errno == EAGAIN)
-				ServerInstance->SE->AddFd(this);
-		}
-		else
-		{
-			/* Wrote the whole buffer, and no need for write callback */
-			buffer.clear();
-		}
-#endif
+		fprintf(log,"%s",line.c_str());
 		if (writeops++ % 20)
 		{
 			fflush(log);
@@ -395,25 +355,12 @@ void FileWriter::Close()
 {
 	if (log)
 	{
-		ServerInstance->SE->Blocking(fileno(log));
-
-		if (buffer.size())
-		{
-			fprintf(log,"%s",buffer.c_str());
-		}
-
-#ifndef WINDOWS
-		ServerInstance->SE->DelFd(this);
-#endif
-
 		fflush(log);
 		fclose(log);
 	}
-
-	buffer.clear();
 }
 
 FileWriter::~FileWriter()
 {
-	this->Close();
 }
+