-/* +------------------------------------+
- * | 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://www.inspircd.org/wiki/index.php/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/>.
*/
-/* $Core */
#include "inspircd.h"
*
*/
-void LogManager::SetupNoFork()
+LogManager::LogManager()
+{
+ Logging = false;
+}
+
+LogManager::~LogManager()
{
- if (!noforkstream)
- {
- FileWriter* fw = new FileWriter(ServerInstance, stdout);
- noforkstream = new FileLogStream(ServerInstance, 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(ServerInstance);
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 == "rawio")
+ {
+ loglevel = RAWIO;
+ ServerInstance->Config->RawLog = true;
+ }
+ else if (level == "debug")
{
loglevel = DEBUG;
- ServerInstance->Config->debugging = true;
}
else if (level == "verbose")
{
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(ServerInstance, f);
+ 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(ServerInstance, loglevel, fw);
+ 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)
}
-FileWriter::FileWriter(InspIRCd* Instance, FILE* logfile)
-: ServerInstance(Instance), log(logfile), writeops(0)
-{
-}
-
-void FileWriter::HandleEvent(EventType ev, int)
+FileWriter::FileWriter(FILE* logfile)
+: log(logfile), writeops(0)
{
}
void FileWriter::WriteLogLine(const std::string &line)
{
- if (log)
+ if (log == NULL)
+ return;
+// XXX: For now, just return. Don't throw an exception. It'd be nice to find out if this is happening, but I'm terrified of breaking so close to final release. -- w00t
+// throw CoreException("FileWriter::WriteLogLine called with a closed logfile");
+
+ fprintf(log,"%s",line.c_str());
+ if (writeops++ % 20)
{
- fprintf(log,"%s",line.c_str());
- if (writeops++ % 20)
- {
- fflush(log);
- }
+ fflush(log);
}
}
-void FileWriter::Close()
+FileWriter::~FileWriter()
{
if (log)
{
fflush(log);
fclose(log);
+ log = NULL;
}
}
-
-FileWriter::~FileWriter()
-{
-}
projects / user / henk / code / inspircd.git / blobdiff