From e3df3b9d267cb3839db268ff6d0be389c45ebf6d Mon Sep 17 00:00:00 2001 From: aquanight Date: Sun, 17 Feb 2008 19:09:03 +0000 Subject: Implement logtype exclusion (ie: '* -USERINPUT -USEROUTPUT' to mean everything except USER{INPUT,OUTPUT}), also pretty up and expand on the documentation in LogManager git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8959 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/logger.cpp | 125 +++++++++++++++++++++++++++++++++++----------- src/modules/m_chanlog.cpp | 7 +-- 2 files changed, 97 insertions(+), 35 deletions(-) (limited to 'src') diff --git a/src/logger.cpp b/src/logger.cpp index c9171292a..20235a826 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -60,15 +60,26 @@ void LogManager::SetupNoFork() 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. + /* 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; @@ -106,19 +117,14 @@ void LogManager::OpenFileLogs() fw = i->second; } FileLogStream* fls = new FileLogStream(ServerInstance, loglevel, fw); - irc::spacesepstream css(type); - std::string tok; - while (css.GetToken(tok)) - { - AddLogType(tok, fls, true); - } + AddLogTypes(type, fls, true); } } void LogManager::CloseLogs() { 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 +132,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 +189,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 +216,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 +240,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 +267,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 +284,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 +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++; } } @@ -282,18 +345,22 @@ 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) { @@ -331,7 +398,9 @@ void FileWriter::Close() ServerInstance->SE->Blocking(fileno(log)); if (buffer.size()) + { fprintf(log,"%s",buffer.c_str()); + } #ifndef WINDOWS ServerInstance->SE->DelFd(this); @@ -348,5 +417,3 @@ FileWriter::~FileWriter() { this->Close(); } - - diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp index 68a349981..2a4535fa5 100644 --- a/src/modules/m_chanlog.cpp +++ b/src/modules/m_chanlog.cpp @@ -94,12 +94,7 @@ class ModuleChanLog : public Module } std::string target = Conf->ReadValue("log", "target", index); ChannelLogStream* c = new ChannelLogStream(ServerInstance, loglevel, target); - irc::spacesepstream css(type); - std::string tok; - while (css.GetToken(tok)) - { - ServerInstance->Logs->AddLogType(tok, c, true); - } + ServerInstance->Logs->AddLogTypes(type, c, true); cls.push_back(c); } } -- cgit v1.2.3