X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flogger.cpp;h=5ad7d98e368dc25eb21d9e2b31a7557557717951;hb=3c93d5d1c46953ad152f619885c4f3678d4a3ecc;hp=7b0fa1798b598c9dd14bbaa6c9d6f3003e249f71;hpb=f995b32ff4a570f3c35521e5d426286dd25c1c89;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/logger.cpp b/src/logger.cpp index 7b0fa1798..5ad7d98e3 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -11,7 +11,7 @@ * --------------------------------------------------- */ -/* $Core: libIRCDlogger */ +/* $Core */ #include "inspircd.h" @@ -44,19 +44,46 @@ * */ +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,40 +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() { 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; } std::map().swap(AllLogStreams); /* And clear it */ +} - /* Now close FileLoggers, for those logstreams that neglected to properly free their stuff. */ - for (FileLogMap::iterator it = FileLogs.begin(); it != FileLogs.end(); ++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()) { - delete it->first; + gi->second.swap(excludes); // Swap with the vector in the hash. } - - FileLogMap().swap(FileLogs); } -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; @@ -132,16 +189,21 @@ bool LogManager::AddLogType(const std::string &type, LogStream *l) } if (type == "*") - GlobalLogStreams.push_back(l); - - std::map::iterator ai = AllLogStreams.find(l); - if (ai == AllLogStreams.end()) { - AllLogStreams.insert(std::make_pair(l, 1)); + GlobalLogStreams.insert(std::make_pair(l, std::vector())); } - else + + if (autoclose) { - ++ai->second; + std::map::iterator ai = AllLogStreams.find(l); + if (ai == AllLogStreams.end()) + { + AllLogStreams.insert(std::make_pair(l, 1)); + } + else + { + ++ai->second; + } } return true; @@ -154,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); } @@ -171,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); } @@ -198,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) { @@ -212,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]; @@ -227,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++; } } @@ -259,53 +333,17 @@ 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() -{ - return false; -} - -void FileWriter::HandleEvent(EventType, int) +void FileWriter::HandleEvent(EventType ev, int) { - WriteLogLine(""); - if (log) - ServerInstance->SE->DelFd(this); } void FileWriter::WriteLogLine(const std::string &line) { - if (line.length()) - buffer.append(line); - if (log) { - 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 + fprintf(log,"%s",line.c_str()); if (writeops++ % 20) { fflush(log); @@ -317,25 +355,12 @@ 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); } - - buffer.clear(); } FileWriter::~FileWriter() { - this->Close(); } -