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

1 files changed, 19 insertions, 14 deletions

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<LogStream *>::iterator gi = GlobalLogStreams.begin();
+
+	while (gi != GlobalLogStreams.end())
+	{
+		(*gi)->OnLog(loglevel, type, msg);
+		gi++;
+	}
+
 	std::map<std::string, std::vector<LogStream *> >::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<LogStream *>::iterator gi = GlobalLogStreams.begin();
-
-	while (gi != GlobalLogStreams.end())
-	{
-		(*gi)->OnLog(loglevel, msg);
-		gi++;
 	}
 
-	// blurp, no handler for this type
-	return;
+	Logging = false;
 }