Fix null dereference caused by tracking dummy

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

diff --git a/src/logger.cpp b/src/logger.cpp
index 05fb801ae76ad951d98f94ef60ee869d0e40b5f8..c9b1cf9e492a5bf8bc4f21c874b96078d2baec54 100644 (file)
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 
 #include "filelogger.h"
@@ -48,8 +46,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,18 +68,21 @@ 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)
+       for (int index = 0;; ++index)
        {
-               std::string method = Conf->ReadValue("log", "method", index);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("log", index);
+               if (!tag)
+                       break;
+               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)
                {
@@ -109,14 +110,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 +331,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 +342,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 +360,7 @@ void FileWriter::Close()
        {
                fflush(log);
                fclose(log);
+               log = NULL;
        }
 }