2.0 alpha 2 release

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

diff --git a/src/logger.cpp b/src/logger.cpp
index e2baa4b8da4137b0434579b8b8a68a40a77865ad..b265a8ea67fcbc57206680bf07c880650f491297 100644 (file)
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 
 #include "filelogger.h"
@@ -44,49 +42,36 @@
  *
  */
 
-void LogManager::SetupNoFork()
+LogManager::LogManager()
+{
+       Logging = false;
+}
+
+LogManager::~LogManager()
 {
-       if (!noforkstream)
-       {
-               FileWriter* fw = new FileWriter(stdout);
-               noforkstream = new FileLogStream(ServerInstance->Config->forcedebug ? DEBUG : DEFAULT, fw);
-       }
-       else
-       {
-               noforkstream->ChangeLevel(ServerInstance->Config->forcedebug ? DEBUG : DEFAULT);
-       }
-       AddLogType("*", noforkstream, false);
 }
 
 void LogManager::OpenFileLogs()
 {
-       /* Re-register the nofork stream if necessary. */
-       if (ServerInstance->Config->nofork)
-       {
-               SetupNoFork();
-       }
        /* Skip rest of logfile opening if we are running -nolog. */
-       if (!ServerInstance->Config->writelog)
-       {
+       if (!ServerInstance->Config->cmdline.writelog)
                return;
-       }
-       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)
+       ConfigTagList tags = ServerInstance->Config->ConfTags("log");
+       for(ConfigIter i = tags.first; i != tags.second; ++i)
        {
-               std::string method = Conf->ReadValue("log", "method", index);
+               ConfigTag* tag = i->second;
+               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)
+               if (level == "debug")
                {
                        loglevel = DEBUG;
-                       ServerInstance->Config->debugging = true;
                }
                else if (level == "verbose")
                {
@@ -105,8 +90,9 @@ void LogManager::OpenFileLogs()
                        loglevel = NONE;
                }
                FileWriter* fw;
-               std::string target = Conf->ReadValue("log", "target", index);
-               if ((i = logmap.find(target)) == logmap.end())
+               std::string target = tag->getString("target");
+               std::map<std::string, FileWriter*>::iterator fwi = logmap.find(target);
+               if (fwi == logmap.end())
                {
                        FILE* f = fopen(target.c_str(), "a");
                        fw = new FileWriter(f);
@@ -114,7 +100,7 @@ void LogManager::OpenFileLogs()
                }
                else
                {
-                       fw = i->second;
+                       fw = fwi->second;
                }
                FileLogStream* fls = new FileLogStream(loglevel, fw);
                AddLogTypes(type, fls, true);
@@ -335,10 +321,6 @@ FileWriter::FileWriter(FILE* logfile)
 {
 }
 
-void FileWriter::HandleEvent(EventType ev, int)
-{
-}
-
 void FileWriter::WriteLogLine(const std::string &line)
 {
        if (log == NULL)
@@ -353,7 +335,7 @@ void FileWriter::WriteLogLine(const std::string &line)
        }
 }
 
-void FileWriter::Close()
+FileWriter::~FileWriter()
 {
        if (log)
        {
@@ -362,8 +344,3 @@ void FileWriter::Close()
                log = NULL;
        }
 }
-
-FileWriter::~FileWriter()
-{
-       this->Close();
-}