From 7c301149883e038a4bf3ce4a7a9a6a91b3e1ce97 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Sun, 5 Feb 2017 19:05:27 +0000 Subject: Allow tags to specify how often logs should be flushed. Also use the behaviour behind this to fix #1290. --- src/inspircd.cpp | 2 +- src/logger.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 5fe2ef076..0c9b67910 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -343,7 +343,7 @@ InspIRCd::InspIRCd(int argc, char** argv) : if (do_debug) { - FileWriter* fw = new FileWriter(stdout); + FileWriter* fw = new FileWriter(stdout, 1); FileLogStream* fls = new FileLogStream(LOG_RAWIO, fw); Logs->AddLogTypes("*", fls, true); } diff --git a/src/logger.cpp b/src/logger.cpp index 5b4a948ee..e3e956325 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -120,7 +120,7 @@ void LogManager::OpenFileLogs() struct tm *mytime = gmtime(&time); strftime(realtarget, sizeof(realtarget), target.c_str(), mytime); FILE* f = fopen(realtarget, "a"); - fw = new FileWriter(f); + fw = new FileWriter(f, static_cast(tag->getInt("flush", 20, 1, INT_MAX))); logmap.insert(std::make_pair(target, fw)); } else @@ -309,8 +309,10 @@ void LogManager::Log(const std::string &type, LogLevel loglevel, const std::stri } -FileWriter::FileWriter(FILE* logfile) -: log(logfile), writeops(0) +FileWriter::FileWriter(FILE* logfile, unsigned int flushcount) + : log(logfile) + , flush(flushcount) + , writeops(0) { } @@ -322,7 +324,7 @@ void FileWriter::WriteLogLine(const std::string &line) // throw CoreException("FileWriter::WriteLogLine called with a closed logfile"); fputs(line.c_str(), log); - if (++writeops % 20 == 0) + if (++writeops % flush == 0) { fflush(log); } -- cgit v1.2.3