Make irc::sockets::* parameters consistent, add irc::sockets::mask

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

diff --git a/src/logger.cpp b/src/logger.cpp
index 19e07e78f64188b5b08e2724ced28d08f853409d..b265a8ea67fcbc57206680bf07c880650f491297 100644 (file)
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -44,54 +44,23 @@
 
 LogManager::LogManager()
 {
-       noforkstream = NULL;
        Logging = false;
 }
 
 LogManager::~LogManager()
 {
-       if (noforkstream)
-       {
-               ServerInstance->Logs = this;
-               delete noforkstream;
-               ServerInstance->Logs = NULL;
-       }
-}
-
-void LogManager::SetupNoFork()
-{
-       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;
        std::map<std::string, FileWriter*> logmap;
-       std::map<std::string, FileWriter*>::iterator i;
-       for (int index = 0;; ++index)
+       ConfigTagList tags = ServerInstance->Config->ConfTags("log");
+       for(ConfigIter i = tags.first; i != tags.second; ++i)
        {
-               ConfigTag* tag = ServerInstance->Config->ConfValue("log", index);
-               if (!tag)
-                       break;
+               ConfigTag* tag = i->second;
                std::string method = tag->getString("method");
                if (method != "file")
                {
@@ -100,10 +69,9 @@ void LogManager::OpenFileLogs()
                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")
                {
@@ -122,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);
@@ -131,7 +100,7 @@ void LogManager::OpenFileLogs()
                }
                else
                {
-                       fw = i->second;
+                       fw = fwi->second;
                }
                FileLogStream* fls = new FileLogStream(loglevel, fw);
                AddLogTypes(type, fls, true);
@@ -352,10 +321,6 @@ FileWriter::FileWriter(FILE* logfile)
 {
 }
 
-void FileWriter::HandleEvent(EventType ev, int)
-{
-}
-
 void FileWriter::WriteLogLine(const std::string &line)
 {
        if (log == NULL)
@@ -370,7 +335,7 @@ void FileWriter::WriteLogLine(const std::string &line)
        }
 }
 
-void FileWriter::Close()
+FileWriter::~FileWriter()
 {
        if (log)
        {
@@ -379,8 +344,3 @@ void FileWriter::Close()
                log = NULL;
        }
 }
-
-FileWriter::~FileWriter()
-{
-       this->Close();
-}