X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flogger.cpp;h=5ad7d98e368dc25eb21d9e2b31a7557557717951;hb=3c93d5d1c46953ad152f619885c4f3678d4a3ecc;hp=458dcf5e0b9169595a4c64ecb7388beb75a25d85;hpb=3897856fb7d887883f7b3c61143ce0b256c00ff8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/logger.cpp b/src/logger.cpp index 458dcf5e0..5ad7d98e3 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -11,10 +11,12 @@ * --------------------------------------------------- */ -/* $Core: libIRCDlogger */ +/* $Core */ #include "inspircd.h" +#include "filelogger.h" + /* * Suggested implementation... * class LogManager @@ -42,12 +44,143 @@ * */ -bool LogManager::AddLogType(const std::string &type, LogStream *l) +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; + } + std::string type = Conf->ReadValue("log", "type", index); + std::string level = Conf->ReadValue("log", "level", index); + int loglevel = DEFAULT; + if (level == "debug" || ServerInstance->Config->forcedebug) + { + loglevel = DEBUG; + ServerInstance->Config->debugging = true; + } + 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 = Conf->ReadValue("log", "target", index); + if ((i = logmap.find(target)) == logmap.end()) + { + FILE* f = fopen(target.c_str(), "a"); + fw = new FileWriter(ServerInstance, f); + logmap.insert(std::make_pair(target, fw)); + } + else + { + fw = i->second; + } + FileLogStream* fls = new FileLogStream(ServerInstance, loglevel, fw); + AddLogTypes(type, fls, true); + } +} + +void LogManager::CloseLogs() +{ + 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 +188,179 @@ 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; + } + + 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; } - return false; + 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; + Logging = false; +} + + +FileWriter::FileWriter(InspIRCd* Instance, FILE* logfile) +: ServerInstance(Instance), log(logfile), writeops(0) +{ +} + +void FileWriter::HandleEvent(EventType ev, int) +{ +} + +void FileWriter::WriteLogLine(const std::string &line) +{ + if (log) + { + fprintf(log,"%s",line.c_str()); + if (writeops++ % 20) + { + fflush(log); + } } +} - // blurp, no handler for this type - return; +void FileWriter::Close() +{ + if (log) + { + fflush(log); + fclose(log); + } } +FileWriter::~FileWriter() +{ +}