Merge pull request #1018 from SaberUK/insp20+hidekills

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

diff --git a/src/logger.cpp b/src/logger.cpp
index b265a8ea67fcbc57206680bf07c880650f491297..89b2be019721289c241b4839bb591820215b1b84 100644 (file)
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
  *
- * ---------------------------------------------------
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 #include "filelogger.h"
@@ -53,6 +62,11 @@ LogManager::~LogManager()
 
 void LogManager::OpenFileLogs()
 {
+       if (ServerInstance->Config->cmdline.forcedebug)
+       {
+               ServerInstance->Config->RawLog = true;
+               return;
+       }
        /* Skip rest of logfile opening if we are running -nolog. */
        if (!ServerInstance->Config->cmdline.writelog)
                return;
@@ -69,7 +83,12 @@ void LogManager::OpenFileLogs()
                std::string type = tag->getString("type");
                std::string level = tag->getString("level");
                int loglevel = DEFAULT;
-               if (level == "debug")
+               if (level == "rawio")
+               {
+                       loglevel = RAWIO;
+                       ServerInstance->Config->RawLog = true;
+               }
+               else if (level == "debug")
                {
                        loglevel = DEBUG;
                }
@@ -94,7 +113,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));
                }
@@ -103,12 +126,15 @@ void LogManager::OpenFileLogs()
                        fw = fwi->second;
                }
                FileLogStream* fls = new FileLogStream(loglevel, fw);
+               fls->OnLog(SPARSE, "HEADER", InspIRCd::LogHeader);
                AddLogTypes(type, fls, true);
        }
 }
 
 void LogManager::CloseLogs()
 {
+       if (ServerInstance->Config && ServerInstance->Config->cmdline.forcedebug)
+               return;
        std::map<std::string, std::vector<LogStream*> >().swap(LogStreams); /* Clear it */
        std::map<LogStream*, std::vector<std::string> >().swap(GlobalLogStreams); /* Clear it */
        for (std::map<LogStream*, int>::iterator i = AllLogStreams.begin(); i != AllLogStreams.end(); ++i)