X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flogger.cpp;h=89b2be019721289c241b4839bb591820215b1b84;hb=4e3d7a6e30eadf714483994681b8b2534229f4a8;hp=458dcf5e0b9169595a4c64ecb7388beb75a25d85;hpb=3897856fb7d887883f7b3c61143ce0b256c00ff8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/logger.cpp b/src/logger.cpp index 458dcf5e0..89b2be019 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -1,20 +1,29 @@ -/* +------------------------------------+ - * | 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" +#include "filelogger.h" + /* * Suggested implementation... * class LogManager @@ -29,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 @@ -39,15 +48,151 @@ * 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 *.. - * + * */ -bool LogManager::AddLogType(const std::string &type, LogStream *l) +LogManager::LogManager() +{ + Logging = false; +} + +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; + std::map logmap; + ConfigTagList tags = ServerInstance->Config->ConfTags("log"); + for(ConfigIter i = tags.first; i != tags.second; ++i) + { + 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 == "rawio") + { + loglevel = RAWIO; + ServerInstance->Config->RawLog = true; + } + else if (level == "debug") + { + loglevel = DEBUG; + } + else if (level == "verbose") + { + loglevel = VERBOSE; + } + else if (level == "default") + { + loglevel = DEFAULT; + } + else if (level == "sparse") + { + loglevel = SPARSE; + } + else if (level == "none") + { + loglevel = NONE; + } + FileWriter* fw; + std::string target = tag->getString("target"); + std::map::iterator fwi = logmap.find(target); + if (fwi == logmap.end()) + { + 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 = 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::map >().swap(GlobalLogStreams); /* Clear it */ + for (std::map::iterator i = AllLogStreams.begin(); i != AllLogStreams.end(); ++i) + { + delete i->first; + } + 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; @@ -55,55 +200,173 @@ bool LogManager::AddLogType(const std::string &type, LogStream *l) LogStreams[type] = v; } + if (type == "*") + { + GlobalLogStreams.insert(std::make_pair(l, std::vector())); + } + + if (autoclose) + { + std::map::iterator ai = AllLogStreams.find(l); + if (ai == AllLogStreams.end()) + { + AllLogStreams.insert(std::make_pair(l, 1)); + } + else + { + ++ai->second; + } + } + return true; } +void LogManager::DelLogStream(LogStream* l) +{ + for (std::map >::iterator i = LogStreams.begin(); i != LogStreams.end(); ++i) + { + std::vector::iterator it; + while ((it = std::find(i->second.begin(), i->second.end(), l)) != i->second.end()) + { + if (it == i->second.end()) + continue; + i->second.erase(it); + } + } + 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. */ + } + delete ai->first; + AllLogStreams.erase(ai); +} + bool LogManager::DelLogType(const std::string &type, LogStream *l) { std::map >::iterator i = LogStreams.find(type); + if (type == "*") + { + std::map >::iterator gi = GlobalLogStreams.find(l); + if (gi != GlobalLogStreams.end()) GlobalLogStreams.erase(gi); + } if (i != LogStreams.end()) { - std::vector::iterator it = i->second.begin(); + std::vector::iterator it = std::find(i->second.begin(), i->second.end(), l); - while (it != i->second.end()) + if (it != i->second.end()) { - if (*it == l) + i->second.erase(it); + if (i->second.size() == 0) { - i->second.erase(it); - - if (i->second.size() == 0) - { - LogStreams.erase(i); - } - - delete l; - return true; + LogStreams.erase(i); } } + else + { + return false; + } + } + else + { + return false; } - return false; + std::map::iterator ai = AllLogStreams.find(l); + if (ai == AllLogStreams.end()) + { + return true; + } + + if ((--ai->second) < 1) + { + AllLogStreams.erase(ai); + delete l; + } + + return true; +} + +void LogManager::Log(const std::string &type, int loglevel, const char *fmt, ...) +{ + if (Logging) + { + return; + } + + va_list a; + static char buf[65536]; + + va_start(a, fmt); + vsnprintf(buf, 65536, fmt, a); + va_end(a); + + this->Log(type, loglevel, std::string(buf)); } void LogManager::Log(const std::string &type, int loglevel, const std::string &msg) { + if (Logging) + { + return; + } + + Logging = true; + + for (std::map >::iterator gi = GlobalLogStreams.begin(); gi != GlobalLogStreams.end(); ++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, msg); + (*it)->OnLog(loglevel, type, msg); } - - return; } - // blurp, no handler for this type - return; + Logging = false; +} + + +FileWriter::FileWriter(FILE* logfile) +: log(logfile), writeops(0) +{ } +void FileWriter::WriteLogLine(const std::string &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"); + + fprintf(log,"%s",line.c_str()); + if (writeops++ % 20) + { + fflush(log); + } +} +FileWriter::~FileWriter() +{ + if (log) + { + fflush(log); + fclose(log); + log = NULL; + } +}