From 1df212127427f88b502a5f1030fd2e0a31bd499e Mon Sep 17 00:00:00 2001 From: w00t Date: Sat, 9 Feb 2008 21:00:07 +0000 Subject: Fix a bug in new logging API (global logstreams weren't notified of events if a specific logstream had an event claimed, don't store type in logstreams (pass it to OnLog instead), and add an example of what the new logging API can do: m_chanlog - logs to #services at the moment. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8865 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/logger.cpp | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) (limited to 'src/logger.cpp') diff --git a/src/logger.cpp b/src/logger.cpp index 53cc7941f..03c02fe09 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -127,8 +127,11 @@ 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; - char buf[65536]; + static char buf[65536]; va_start(a, fmt); vsnprintf(buf, 65536, fmt, a); @@ -139,6 +142,19 @@ 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()) + { + (*gi)->OnLog(loglevel, type, msg); + gi++; + } + std::map >::iterator i = LogStreams.find(type); if (i != LogStreams.end()) @@ -147,23 +163,12 @@ void LogManager::Log(const std::string &type, int loglevel, const std::string &m while (it != i->second.end()) { - (*it)->OnLog(loglevel, msg); + (*it)->OnLog(loglevel, type, msg); it++; } - - return; - } - - std::vector::iterator gi = GlobalLogStreams.begin(); - - while (gi != GlobalLogStreams.end()) - { - (*gi)->OnLog(loglevel, msg); - gi++; } - // blurp, no handler for this type - return; + Logging = false; } -- cgit v1.2.3