X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flogger.cpp;h=89b2be019721289c241b4839bb591820215b1b84;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=5c24a4451b297474458b40abaca2ea54b407c272;hpb=11f1f2126c3e1f1cb91f5d6e273eba2850ca61a8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/logger.cpp b/src/logger.cpp index 5c24a4451..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: libIRCDlogger */ #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,41 +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 : ServerInstance->Config->LogLevel, fw); - } - else - { - noforkstream->ChangeLevel(ServerInstance->Config->forcedebug ? DEBUG : ServerInstance->Config->LogLevel); - } - AddLogType("*", noforkstream, false); } void LogManager::OpenFileLogs() { - if (ServerInstance->Config->nofork) SetupNoFork(); // Call this to reregister the nofork stream. - if (!ServerInstance->Config->writelog) return; // Skip rest of logfile opening if we are running -nolog. - ConfigReader* Conf = new ConfigReader(ServerInstance); + 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; 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); - if (method != "file") continue; - std::string type = Conf->ReadValue("log", "type", index); - std::string level = Conf->ReadValue("log", "level", index); + ConfigTag* tag = i->second; + std::string method = tag->getString("method"); + if (method != "file") + { + continue; + } + 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") { @@ -94,31 +109,34 @@ 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; - } - FileLogStream* fls = new FileLogStream(ServerInstance, loglevel, fw); - irc::commasepstream css(type); - std::string tok; - while (css.GetToken(tok)) - { - AddLogType(tok, fls, true); + 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 >().swap(LogStreams); /* Clear it */ - std::vector().swap(GlobalLogStreams); /* Clear it */ + std::map >().swap(GlobalLogStreams); /* Clear it */ for (std::map::iterator i = AllLogStreams.begin(); i != AllLogStreams.end(); ++i) { delete i->first; @@ -126,12 +144,55 @@ void LogManager::CloseLogs() std::map().swap(AllLogStreams); /* And clear it */ } +void LogManager::AddLogTypes(const std::string &types, LogStream* l, bool autoclose) +{ + irc::spacesepstream css(types); + std::string tok; + std::vector excludes; + while (css.GetToken(tok)) + { + if (tok.empty()) + { + continue; + } + if (tok.at(0) == '-') + { + /* Exclude! */ + excludes.push_back(tok.substr(1)); + } + else + { + AddLogType(tok, l, autoclose); + } + } + // Handle doing things like: USERINPUT USEROUTPUT -USERINPUT should be the same as saying just USEROUTPUT. + // (This is so modules could, for example, inject exclusions for logtypes they can't handle.) + for (std::vector::iterator i = excludes.begin(); i != excludes.end(); ++i) + { + if (*i == "*") + { + /* -* == Exclude all. Why someone would do this, I dunno. */ + DelLogStream(l); + return; + } + DelLogType(*i, l); + } + // Now if it's registered as a global, add the exclusions there too. + std::map >::iterator gi = GlobalLogStreams.find(l); + if (gi != GlobalLogStreams.end()) + { + gi->second.swap(excludes); // Swap with the vector in the hash. + } +} + bool LogManager::AddLogType(const std::string &type, LogStream *l, bool autoclose) { std::map >::iterator i = LogStreams.find(type); if (i != LogStreams.end()) + { i->second.push_back(l); + } else { std::vector v; @@ -140,7 +201,9 @@ bool LogManager::AddLogType(const std::string &type, LogStream *l, bool autoclos } if (type == "*") - GlobalLogStreams.push_back(l); + { + GlobalLogStreams.insert(std::make_pair(l, std::vector())); + } if (autoclose) { @@ -165,14 +228,21 @@ void LogManager::DelLogStream(LogStream* l) std::vector::iterator it; while ((it = std::find(i->second.begin(), i->second.end(), l)) != i->second.end()) { - if (it == i->second.end()) continue; + if (it == i->second.end()) + continue; i->second.erase(it); } } - std::vector::iterator gi = std::find(GlobalLogStreams.begin(), GlobalLogStreams.end(), l); - if (gi != GlobalLogStreams.end()) GlobalLogStreams.erase(gi); + std::map >::iterator gi = GlobalLogStreams.find(l); + if (gi != GlobalLogStreams.end()) + { + GlobalLogStreams.erase(gi); + } std::map::iterator ai = AllLogStreams.begin(); - if (ai == AllLogStreams.end()) return; /* Done. */ + if (ai == AllLogStreams.end()) + { + return; /* Done. */ + } delete ai->first; AllLogStreams.erase(ai); } @@ -182,7 +252,7 @@ bool LogManager::DelLogType(const std::string &type, LogStream *l) std::map >::iterator i = LogStreams.find(type); if (type == "*") { - std::vector::iterator gi = std::find(GlobalLogStreams.begin(), GlobalLogStreams.end(), l); + std::map >::iterator gi = GlobalLogStreams.find(l); if (gi != GlobalLogStreams.end()) GlobalLogStreams.erase(gi); } @@ -209,7 +279,10 @@ bool LogManager::DelLogType(const std::string &type, LogStream *l) } std::map::iterator ai = AllLogStreams.find(l); - if (ai == AllLogStreams.end()) return true; + if (ai == AllLogStreams.end()) + { + return true; + } if ((--ai->second) < 1) { @@ -223,7 +296,9 @@ bool LogManager::DelLogType(const std::string &type, LogStream *l) void LogManager::Log(const std::string &type, int loglevel, const char *fmt, ...) { if (Logging) + { return; + } va_list a; static char buf[65536]; @@ -238,28 +313,28 @@ void LogManager::Log(const std::string &type, int loglevel, const char *fmt, ... void LogManager::Log(const std::string &type, int loglevel, const std::string &msg) { if (Logging) + { return; + } Logging = true; - std::vector::iterator gi = GlobalLogStreams.begin(); - - while (gi != GlobalLogStreams.end()) + for (std::map >::iterator gi = GlobalLogStreams.begin(); gi != GlobalLogStreams.end(); ++gi) { - (*gi)->OnLog(loglevel, type, msg); - gi++; + if (std::find(gi->second.begin(), gi->second.end(), type) != gi->second.end()) + { + continue; + } + gi->first->OnLog(loglevel, type, msg); } std::map >::iterator i = LogStreams.find(type); if (i != LogStreams.end()) { - std::vector::iterator it = i->second.begin(); - - while (it != i->second.end()) + for (std::vector::iterator it = i->second.begin(); it != i->second.end(); ++it) { (*it)->OnLog(loglevel, type, msg); - it++; } } @@ -267,86 +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) +FileWriter::FileWriter(FILE* logfile) +: log(logfile), writeops(0) { - if (log) - { - Instance->SE->NonBlocking(fileno(log)); - SetFd(fileno(log)); - buffer.clear(); - } -} - -bool FileWriter::Readable() -{ - return false; -} - -void FileWriter::HandleEvent(EventType, int) -{ - WriteLogLine(""); - if (log) - ServerInstance->SE->DelFd(this); } void FileWriter::WriteLogLine(const std::string &line) { - if (line.length()) - buffer.append(line); + 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"); - if (log) + fprintf(log,"%s",line.c_str()); + if (writeops++ % 20) { - int written = fprintf(log,"%s",buffer.c_str()); -#ifdef WINDOWS - buffer.clear(); -#else - if ((written >= 0) && (written < (int)buffer.length())) - { - buffer.erase(0, buffer.length()); - ServerInstance->SE->AddFd(this); - } - else if (written == -1) - { - if (errno == EAGAIN) - ServerInstance->SE->AddFd(this); - } - else - { - /* Wrote the whole buffer, and no need for write callback */ - buffer.clear(); - } -#endif - if (writeops++ % 20) - { - fflush(log); - } + fflush(log); } } -void FileWriter::Close() +FileWriter::~FileWriter() { if (log) { - ServerInstance->SE->Blocking(fileno(log)); - - if (buffer.size()) - fprintf(log,"%s",buffer.c_str()); - -#ifndef WINDOWS - ServerInstance->SE->DelFd(this); -#endif - fflush(log); fclose(log); + log = NULL; } - - buffer.clear(); } - -FileWriter::~FileWriter() -{ - this->Close(); -} - -