Convert m_spanningtree

[user/henk/code/inspircd.git] / src / filelogger.cpp

diff --git a/src/filelogger.cpp b/src/filelogger.cpp
index 0e50f628e9877743cc639e81e8e8cc2e0bc5d89b..fd86e45944bb2def030c692182ee0642831312ef 100644 (file)
--- a/src/filelogger.cpp
+++ b/src/filelogger.cpp
@@ -19,90 +19,19 @@
 #include "inspircd_se_config.h"
 #include "filelogger.h"
 
-FileLogger::FileLogger(InspIRCd* Instance, FILE* logfile)
-: ServerInstance(Instance), log(logfile), writeops(0)
+FileLogStream::FileLogStream(InspIRCd *Instance, int loglevel, FileWriter *fw)
+       : LogStream(Instance, loglevel), f(fw)
 {
-       if (log)
-       {
-               Instance->SE->NonBlocking(fileno(log));
-               SetFd(fileno(log));
-               buffer.clear();
-       }
-}
-
-bool FileLogger::Readable()
-{
-       return false;
-}
-    
-void FileLogger::HandleEvent(EventType, int)
-{
-       WriteLogLine("");
-       if (log)
-               ServerInstance->SE->DelFd(this);
-}
-
-void FileLogger::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
-               if (writeops++ % 20)
-               {
-                       fflush(log);
-               }
-       }
-}
-
-void FileLogger::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();
+       ServerInstance->Logs->AddLoggerRef(f);
 }
 
-FileLogger::~FileLogger()
+FileLogStream::~FileLogStream()
 {
-       this->Close();
+       /* FileWriter is managed externally now */
+       ServerInstance->Logs->DelLoggerRef(f);
 }
 
-
-void FileLogStream::OnLog(int loglevel, const std::string &text)
+void FileLogStream::OnLog(int loglevel, const std::string &type, const std::string &text)
 {
        static char TIMESTR[26];
        static time_t LAST = 0;
@@ -112,8 +41,10 @@ void FileLogStream::OnLog(int loglevel, const std::string &text)
                return;
 
        /* If we were given -debug we output all messages, regardless of configured loglevel */
-       if ((loglevel < ServerInstance->Config->LogLevel) && !ServerInstance->Config->forcedebug)
+       if ((loglevel < this->loglvl) && !ServerInstance->Config->forcedebug)
+       {
                return;
+       }
 
        if (ServerInstance->Time() != LAST)
        {
@@ -125,14 +56,6 @@ void FileLogStream::OnLog(int loglevel, const std::string &text)
                LAST = ServerInstance->Time();
        }
 
-       if (ServerInstance->Config->log_file && ServerInstance->Config->writelog)
-       {
-               std::string out = std::string(TIMESTR) + " " + text.c_str() + "\n";
-               this->f->WriteLogLine(out);
-       }
-
-       if (ServerInstance->Config->nofork)
-       {
-               printf("%s %s\n", TIMESTR, text.c_str());
-       }
+       std::string out = std::string(TIMESTR) + " " + text.c_str() + "\n";
+       this->f->WriteLogLine(out);
 }