X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flogger.cpp;h=5ebcf4b00d782f0b5903a38c1d092ca94413c017;hb=d494fa6e094e85cd29235e995fb2b447d6e1f168;hp=2b0b623f604f6548d3da55f4a609e22113c7e1d1;hpb=4e40ee49bba3f7bab05a58516e2039351fb33069;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/logger.cpp b/src/logger.cpp index 2b0b623f6..5ebcf4b00 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -1,10 +1,16 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2008 Craig Edwards + * Copyright (C) 2013-2014 Attila Molnar + * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell + * Copyright (C) 2013 Daniel Vassdal + * Copyright (C) 2012 Robby + * Copyright (C) 2010 Craig Edwards + * Copyright (C) 2010 Adam + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2008-2009 Robin Burchell * Copyright (C) 2008 Thomas Stagner - * Copyright (C) 2008 Robin Burchell * * 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 @@ -22,8 +28,6 @@ #include "inspircd.h" -#include "filelogger.h" - /* * Suggested implementation... * class LogManager @@ -51,9 +55,12 @@ * */ +const char LogStream::LogHeader[] = + "Log started for " INSPIRCD_VERSION; + LogManager::LogManager() + : Logging(false) { - Logging = false; } LogManager::~LogManager() @@ -76,49 +83,49 @@ void LogManager::OpenFileLogs() { ConfigTag* tag = i->second; std::string method = tag->getString("method"); - if (method != "file") + if (!stdalgo::string::equalsci(method, "file")) { continue; } std::string type = tag->getString("type"); std::string level = tag->getString("level"); - int loglevel = LOG_DEFAULT; - if (level == "rawio") + LogLevel loglevel = LOG_DEFAULT; + if (stdalgo::string::equalsci(level, "rawio")) { loglevel = LOG_RAWIO; ServerInstance->Config->RawLog = true; } - else if (level == "debug") + else if (stdalgo::string::equalsci(level, "debug")) { loglevel = LOG_DEBUG; } - else if (level == "verbose") + else if (stdalgo::string::equalsci(level, "verbose")) { loglevel = LOG_VERBOSE; } - else if (level == "default") + else if (stdalgo::string::equalsci(level, "default")) { loglevel = LOG_DEFAULT; } - else if (level == "sparse") + else if (stdalgo::string::equalsci(level, "sparse")) { loglevel = LOG_SPARSE; } - else if (level == "none") + else if (stdalgo::string::equalsci(level, "none")) { loglevel = LOG_NONE; } FileWriter* fw; - std::string target = tag->getString("target"); + std::string target = ServerInstance->Config->Paths.PrependLog(tag->getString("target")); std::map::iterator fwi = logmap.find(target); if (fwi == logmap.end()) { - char realtarget[MAXBUF]; + char realtarget[256]; time_t time = ServerInstance->Time(); struct tm *mytime = gmtime(&time); - strftime(realtarget, MAXBUF, target.c_str(), mytime); + strftime(realtarget, sizeof(realtarget), target.c_str(), mytime); FILE* f = fopen(realtarget, "a"); - fw = new FileWriter(f); + fw = new FileWriter(f, tag->getUInt("flush", 20, 1, UINT_MAX)); logmap.insert(std::make_pair(target, fw)); } else @@ -126,7 +133,7 @@ void LogManager::OpenFileLogs() fw = fwi->second; } FileLogStream* fls = new FileLogStream(loglevel, fw); - fls->OnLog(LOG_SPARSE, "HEADER", InspIRCd::LogHeader); + fls->OnLog(LOG_SPARSE, "HEADER", LogStream::LogHeader); AddLogTypes(type, fls, true); } } @@ -135,13 +142,16 @@ void LogManager::CloseLogs() { if (ServerInstance->Config && ServerInstance->Config->cmdline.forcedebug) return; - std::map >().swap(LogStreams); /* Clear it */ - std::map >().swap(GlobalLogStreams); /* Clear it */ + + LogStreams.clear(); + GlobalLogStreams.clear(); + for (std::map::iterator i = AllLogStreams.begin(); i != AllLogStreams.end(); ++i) { delete i->first; } - std::map().swap(AllLogStreams); /* And clear it */ + + AllLogStreams.clear(); } void LogManager::AddLogTypes(const std::string &types, LogStream* l, bool autoclose) @@ -187,36 +197,13 @@ void LogManager::AddLogTypes(const std::string &types, LogStream* l, bool autocl 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; - v.push_back(l); - LogStreams[type] = v; - } + LogStreams[type].push_back(l); 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; - } - } + AllLogStreams[l]++; return true; } @@ -225,24 +212,20 @@ 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()) + while (stdalgo::erase(i->second, l)) { - if (it == i->second.end()) - continue; - i->second.erase(it); + // Keep erasing while it exists } } - std::map >::iterator gi = GlobalLogStreams.find(l); - if (gi != GlobalLogStreams.end()) - { - GlobalLogStreams.erase(gi); - } + + GlobalLogStreams.erase(l); + std::map::iterator ai = AllLogStreams.begin(); if (ai == AllLogStreams.end()) { return; /* Done. */ } + delete ai->first; AllLogStreams.erase(ai); } @@ -252,17 +235,13 @@ 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); + GlobalLogStreams.erase(l); } if (i != LogStreams.end()) { - std::vector::iterator it = std::find(i->second.begin(), i->second.end(), l); - - if (it != i->second.end()) + if (stdalgo::erase(i->second, l)) { - i->second.erase(it); if (i->second.size() == 0) { LogStreams.erase(i); @@ -293,7 +272,7 @@ bool LogManager::DelLogType(const std::string &type, LogStream *l) return true; } -void LogManager::Log(const std::string &type, int loglevel, const char *fmt, ...) +void LogManager::Log(const std::string &type, LogLevel loglevel, const char *fmt, ...) { if (Logging) return; @@ -303,7 +282,7 @@ void LogManager::Log(const std::string &type, int loglevel, const char *fmt, ... this->Log(type, loglevel, buf); } -void LogManager::Log(const std::string &type, int loglevel, const std::string &msg) +void LogManager::Log(const std::string &type, LogLevel loglevel, const std::string &msg) { if (Logging) { @@ -314,7 +293,7 @@ void LogManager::Log(const std::string &type, int loglevel, const std::string &m for (std::map >::iterator gi = GlobalLogStreams.begin(); gi != GlobalLogStreams.end(); ++gi) { - if (std::find(gi->second.begin(), gi->second.end(), type) != gi->second.end()) + if (stdalgo::isin(gi->second, type)) { continue; } @@ -335,8 +314,10 @@ void LogManager::Log(const std::string &type, int loglevel, const std::string &m } -FileWriter::FileWriter(FILE* logfile) -: log(logfile), writeops(0) +FileWriter::FileWriter(FILE* logfile, unsigned int flushcount) + : log(logfile) + , flush(flushcount) + , writeops(0) { } @@ -347,8 +328,8 @@ void FileWriter::WriteLogLine(const std::string &line) // 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) + fputs(line.c_str(), log); + if (++writeops % flush == 0) { fflush(log); }