Remove last vestige of libircdfoo, by changing tag into a single identifier marking...

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

diff --git a/src/filelogger.cpp b/src/filelogger.cpp
index f67ce483cab1d1da26c82cee43dc7814dc9439d5..e567e4609b94c9132507e5a6cf59dd840c72bdaa 100644 (file)
--- a/src/filelogger.cpp
+++ b/src/filelogger.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDfilelogger */
+/* $Core */
 
 #include "inspircd.h"
 #include <fstream>
@@ -19,85 +19,43 @@
 #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();
-       }
+       ServerInstance->Logs->AddLoggerRef(f);
 }
 
-bool FileLogger::Readable()
-{
-       return false;
-}
-    
-void FileLogger::HandleEvent(EventType, int)
+FileLogStream::~FileLogStream()
 {
-       WriteLogLine("");
-       if (log)
-               ServerInstance->SE->DelFd(this);
+       /* FileWriter is managed externally now */
+       ServerInstance->Logs->DelLoggerRef(f);
 }
 
-void FileLogger::WriteLogLine(const std::string &line)
+void FileLogStream::OnLog(int loglevel, const std::string &type, const std::string &text)
 {
-       if (line.length())
-               buffer.append(line);
+       static char TIMESTR[26];
+       static time_t LAST = 0;
 
-       if (log)
+       /* sanity check, just in case */
+       if (!ServerInstance->Config)
+               return;
+
+       /* If we were given -debug we output all messages, regardless of configured loglevel */
+       if ((loglevel < this->loglvl) && !ServerInstance->Config->forcedebug)
        {
-               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);
-               }
+               return;
        }
-}
 
-void FileLogger::Close()
-{
-       if (log)
+       if (ServerInstance->Time() != LAST)
        {
-               ServerInstance->SE->Blocking(fileno(log));
+               time_t local = ServerInstance->Time();
+               struct tm *timeinfo = localtime(&local);
 
-               if (buffer.size())
-                       fprintf(log,"%s",buffer.c_str());
-
-#ifndef WINDOWS
-               ServerInstance->SE->DelFd(this);
-#endif
-
-               fflush(log);
-               fclose(log);
+               strlcpy(TIMESTR,asctime(timeinfo),26);
+               TIMESTR[24] = ':';
+               LAST = ServerInstance->Time();
        }
 
-       buffer.clear();
-}
-
-FileLogger::~FileLogger()
-{
-       this->Close();
+       std::string out = std::string(TIMESTR) + " " + text.c_str() + "\n";
+       this->f->WriteLogLine(out);
 }
-