X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flogger.cpp;h=049b4b5e7aa0883ca48fa77af7f4f3afdba443b1;hb=0ed3ef9dee2cb8f4b0c37da218a2fd1eee8c31f6;hp=b8cd3b298564552d9908a301361c8dc0c850f727;hpb=5db1d322be106c8462dc691072f9415dc0766ed4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/logger.cpp b/src/logger.cpp index b8cd3b298..049b4b5e7 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,7 +11,7 @@ * --------------------------------------------------- */ -/* $Core: libIRCDlogger */ +/* $Core */ #include "inspircd.h" @@ -31,7 +31,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,22 +41,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() +{ + 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) + { + SetupNoFork(); + } + /* Skip rest of logfile opening if we are running -nolog. */ + if (!ServerInstance->Config->writelog) + { + return; + } ConfigReader* Conf = new ConfigReader(ServerInstance); std::map logmap; std::map::iterator i; for (int index = 0; index < Conf->Enumerate("log"); ++index) { std::string method = Conf->ReadValue("log", "method", index); - if (method != "file") continue; + if (method != "file") + { + continue; + } std::string type = Conf->ReadValue("log", "type", index); std::string level = Conf->ReadValue("log", "level", index); int loglevel = DEFAULT; - if (level == "debug") + if (level == "debug" || ServerInstance->Config->forcedebug) { loglevel = DEBUG; ServerInstance->Config->debugging = true; @@ -90,52 +117,70 @@ void LogManager::OpenFileLogs() fw = i->second; } FileLogStream* fls = new FileLogStream(ServerInstance, loglevel, fw); - irc::commasepstream css(type); - std::string tok; - while (css.GetToken(tok)) - { - AddLogType(tok, fls); - } + AddLogTypes(type, fls, true); } } void LogManager::CloseLogs() { - /* - * This doesn't remove logstreams from the map/vector etc, because if this is called, shit is hitting the fan - * and we're going down anyway - this just provides a "nice" way for logstreams to clean up. -- w - */ - std::map >::iterator i; - - while (LogStreams.begin() != LogStreams.end()) + std::map >().swap(LogStreams); /* Clear it */ + std::map >().swap(GlobalLogStreams); /* Clear it */ + for (std::map::iterator i = AllLogStreams.begin(); i != AllLogStreams.end(); ++i) { - i = LogStreams.begin(); + delete i->first; + } + std::map().swap(AllLogStreams); /* And clear it */ +} - while (i->second.begin() != i->second.end()) +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()) { - std::vector::iterator it = i->second.begin(); - - delete (*it); - i->second.erase(it); + continue; + } + if (tok.at(0) == '-') + { + /* Exclude! */ + excludes.push_back(tok.substr(1)); + } + else + { + AddLogType(tok, l, autoclose); } - - LogStreams.erase(i); } - /* Now close FileLoggers, for those logstreams that neglected to properly free their stuff. */ - for (FileLogMap::iterator it = FileLogs.begin(); it != FileLogs.end(); ++i) + // 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) { - delete it->first; + 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. } - - FileLogMap().swap(FileLogs); /* Swap with empty map to clear */ } -bool LogManager::AddLogType(const std::string &type, LogStream *l) +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; @@ -144,55 +189,104 @@ bool LogManager::AddLogType(const std::string &type, LogStream *l) } if (type == "*") - GlobalLogStreams.push_back(l); + { + 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; } -bool LogManager::DelLogType(const std::string &type, LogStream *l) +void LogManager::DelLogStream(LogStream* l) { - std::map >::iterator i = LogStreams.find(type); - std::vector::iterator gi = GlobalLogStreams.begin(); - - while (gi != GlobalLogStreams.end()) + for (std::map >::iterator i = LogStreams.begin(); i != LogStreams.end(); ++i) { - if ((*gi) == l) + std::vector::iterator it; + while ((it = std::find(i->second.begin(), i->second.end(), l)) != i->second.end()) { - GlobalLogStreams.erase(gi); - break; + 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); } - - it++; + } + else + { + return false; } } + else + { + 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 false; + return true; } void LogManager::Log(const std::string &type, int loglevel, const char *fmt, ...) { if (Logging) + { return; + } va_list a; static char buf[65536]; @@ -207,28 +301,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++; } } @@ -239,57 +333,23 @@ 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) { - if (log) - { - Instance->SE->NonBlocking(fileno(log)); - SetFd(fileno(log)); - buffer.clear(); - } } -bool FileWriter::Readable() +void FileWriter::HandleEvent(EventType ev, int) { - 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); } } @@ -297,25 +357,13 @@ void FileWriter::Close() { 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(); } - -