X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flogger.cpp;h=89b2be019721289c241b4839bb591820215b1b84;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=c9b1cf9e492a5bf8bc4f21c874b96078d2baec54;hpb=bf6724c049ba0f156544c49aab2008d6280e5ffa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/logger.cpp b/src/logger.cpp
index c9b1cf9e4..89b2be019 100644
--- 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"
@@ -42,40 +51,30 @@
  *
  */
 
-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)
+	if (ServerInstance->Config->cmdline.forcedebug)
 	{
-		SetupNoFork();
+		ServerInstance->Config->RawLog = true;
+		return;
 	}
 	/* 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)
+	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")
 		{
@@ -84,10 +83,14 @@ 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 == "rawio")
+		{
+			loglevel = RAWIO;
+			ServerInstance->Config->RawLog = true;
+		}
+		else if (level == "debug")
 		{
 			loglevel = DEBUG;
-			ServerInstance->Config->debugging = true;
 		}
 		else if (level == "verbose")
 		{
@@ -106,24 +109,32 @@ 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");
+			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));
 		}
 		else
 		{
-			fw = i->second;
+			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)
@@ -336,10 +347,6 @@ FileWriter::FileWriter(FILE* logfile)
 {
 }
 
-void FileWriter::HandleEvent(EventType ev, int)
-{
-}
-
 void FileWriter::WriteLogLine(const std::string &line)
 {
 	if (log == NULL)
@@ -354,7 +361,7 @@ void FileWriter::WriteLogLine(const std::string &line)
 	}
 }
 
-void FileWriter::Close()
+FileWriter::~FileWriter()
 {
 	if (log)
 	{
@@ -363,8 +370,3 @@ void FileWriter::Close()
 		log = NULL;
 	}
 }
-
-FileWriter::~FileWriter()
-{
-	this->Close();
-}