Change SERVICE_{CMODE,UMODE} to SERVICE_MODE, which makes more sense

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

diff --git a/src/logger.cpp b/src/logger.cpp
index e92762b46e0b7b516858b9ba7501ca31909cc743..8c9d9a79bf6dbb5fb797f987f31bb96a73c8d38b 100644 (file)
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -44,47 +44,18 @@
 
 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;
        ConfigTagList tags = ServerInstance->Config->ConfTags("log");
        for(ConfigIter i = tags.first; i != tags.second; ++i)
@@ -98,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")
                {
@@ -124,7 +94,11 @@ void LogManager::OpenFileLogs()
                std::map<std::string, FileWriter*>::iterator fwi = logmap.find(target);
                if (fwi == logmap.end())
                {
-                       FILE* f = fopen(target.c_str(), "a");
+                       char realtarget[MAXBUF];
+                       time_t time = ServerInstance->Time();
+                       struct tm *mytime = gmtime(&time);
+                       strftime(realtarget, MAXBUF, target.c_str(), mytime);
+                       FILE* f = fopen(realtarget, "a");
                        fw = new FileWriter(f);
                        logmap.insert(std::make_pair(target, fw));
                }