X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flogger.cpp;h=89b2be019721289c241b4839bb591820215b1b84;hb=571714e28b26cc59cbc8d27098a5ba981240ee2d;hp=5ad7d98e368dc25eb21d9e2b31a7557557717951;hpb=6a869d0701bbfe3c7a5e370793adfda4b5b45c65;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/logger.cpp b/src/logger.cpp index 5ad7d98e3..89b2be019 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -1,17 +1,24 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Craig Edwards + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2008 Robin Burchell * - * InspIRCd: (C) 2002-2008 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 . */ -/* $Core */ #include "inspircd.h" @@ -31,7 +38,7 @@ * * How it works: * Modules create their own logstream types (core will create one for 'file logging' for example) and create instances of these logstream types - * and register interest in a certain logtype. Globbing is not here, with the exception of * - for all events.. loglevel is used to drop + * and register interest in a certain logtype. Globbing is not here, with the exception of * - for all events.. loglevel is used to drop * events that are of no interest to a logstream. * * When Log is called, the vector of logstreams for that type is iterated (along with the special vector for "*"), and all registered logstreams @@ -41,52 +48,49 @@ * NOTE: Somehow we have to let LogManager manage the non-blocking file streams and provide an interface to share them with various LogStreams, * as, for example, a user may want to let 'KILL' and 'XLINE' snotices go to /home/ircd/inspircd/logs/operactions.log, or whatever. How * can we accomplish this easily? I guess with a map of pre-loved logpaths, and a pointer of FILE *.. - * + * */ -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 logmap; - std::map::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") { @@ -105,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::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 >().swap(LogStreams); /* Clear it */ std::map >().swap(GlobalLogStreams); /* Clear it */ for (std::map::iterator i = AllLogStreams.begin(); i != AllLogStreams.end(); ++i) @@ -330,37 +342,31 @@ void LogManager::Log(const std::string &type, int loglevel, const std::string &m } -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() -{ -} -