1 files changed, 36 insertions, 64 deletions

diff --git a/src/logger.cpp b/src/logger.cpp
index 89b2be019..61ac517c7 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -21,7 +21,6 @@
 
 
 #include "inspircd.h"
-
 #include "filelogger.h"
 
 /*
@@ -51,9 +50,13 @@
  *
  */
 
+const char LogStream::LogHeader[] =
+	"Log started for " VERSION " (" REVISION ", " MODULE_INIT_STR ")"
+	" - compiled on " SYSTEM;
+
 LogManager::LogManager()
+	: Logging(false)
 {
-	Logging = false;
 }
 
 LogManager::~LogManager()
@@ -82,41 +85,41 @@ void LogManager::OpenFileLogs()
 		}
 		std::string type = tag->getString("type");
 		std::string level = tag->getString("level");
-		int loglevel = DEFAULT;
+		LogLevel loglevel = LOG_DEFAULT;
 		if (level == "rawio")
 		{
-			loglevel = RAWIO;
+			loglevel = LOG_RAWIO;
 			ServerInstance->Config->RawLog = true;
 		}
 		else if (level == "debug")
 		{
-			loglevel = DEBUG;
+			loglevel = LOG_DEBUG;
 		}
 		else if (level == "verbose")
 		{
-			loglevel = VERBOSE;
+			loglevel = LOG_VERBOSE;
 		}
 		else if (level == "default")
 		{
-			loglevel = DEFAULT;
+			loglevel = LOG_DEFAULT;
 		}
 		else if (level == "sparse")
 		{
-			loglevel = SPARSE;
+			loglevel = LOG_SPARSE;
 		}
 		else if (level == "none")
 		{
-			loglevel = NONE;
+			loglevel = LOG_NONE;
 		}
 		FileWriter* fw;
-		std::string target = tag->getString("target");
+		std::string target = ServerInstance->Config->Paths.PrependLog(tag->getString("target"));
 		std::map<std::string, FileWriter*>::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);
 			logmap.insert(std::make_pair(target, fw));
@@ -126,7 +129,7 @@ void LogManager::OpenFileLogs()
 			fw = fwi->second;
 		}
 		FileLogStream* fls = new FileLogStream(loglevel, fw);
-		fls->OnLog(SPARSE, "HEADER", InspIRCd::LogHeader);
+		fls->OnLog(LOG_SPARSE, "HEADER", LogStream::LogHeader);
 		AddLogTypes(type, fls, true);
 	}
 }
@@ -135,13 +138,16 @@ void LogManager::CloseLogs()
 {
 	if (ServerInstance->Config && ServerInstance->Config->cmdline.forcedebug)
 		return;
-	std::map<std::string, std::vector<LogStream*> >().swap(LogStreams); /* Clear it */
-	std::map<LogStream*, std::vector<std::string> >().swap(GlobalLogStreams); /* Clear it */
+
+	LogStreams.clear();
+	GlobalLogStreams.clear();
+
 	for (std::map<LogStream*, int>::iterator i = AllLogStreams.begin(); i != AllLogStreams.end(); ++i)
 	{
 		delete i->first;
 	}
-	std::map<LogStream*, int>().swap(AllLogStreams); /* And clear it */
+
+	AllLogStreams.clear();
 }
 
 void LogManager::AddLogTypes(const std::string &types, LogStream* l, bool autoclose)
@@ -187,36 +193,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<std::string, std::vector<LogStream *> >::iterator i = LogStreams.find(type);
-
-	if (i != LogStreams.end())
-	{
-		i->second.push_back(l);
-	}
-	else
-	{
-		std::vector<LogStream *> v;
-		v.push_back(l);
-		LogStreams[type] = v;
-	}
+	LogStreams[type].push_back(l);
 
 	if (type == "*")
-	{
 		GlobalLogStreams.insert(std::make_pair(l, std::vector<std::string>()));
-	}
 
 	if (autoclose)
-	{
-		std::map<LogStream*, int>::iterator ai = AllLogStreams.find(l);
-		if (ai == AllLogStreams.end())
-		{
-			AllLogStreams.insert(std::make_pair(l, 1));
-		}
-		else
-		{
-			++ai->second;
-		}
-	}
+		AllLogStreams[l]++;
 
 	return true;
 }
@@ -228,21 +211,18 @@ void LogManager::DelLogStream(LogStream* l)
 		std::vector<LogStream*>::iterator it;
 		while ((it = std::find(i->second.begin(), i->second.end(), l)) != i->second.end())
 		{
-			if (it == i->second.end())
-				continue;
 			i->second.erase(it);
 		}
 	}
-	std::map<LogStream *, std::vector<std::string> >::iterator gi = GlobalLogStreams.find(l);
-	if (gi != GlobalLogStreams.end())
-	{
-		GlobalLogStreams.erase(gi);
-	}
+
+	GlobalLogStreams.erase(l);
+
 	std::map<LogStream*, int>::iterator ai = AllLogStreams.begin();
 	if (ai == AllLogStreams.end())
 	{
 		return; /* Done. */
 	}
+
 	delete ai->first;
 	AllLogStreams.erase(ai);
 }
@@ -252,8 +232,7 @@ bool LogManager::DelLogType(const std::string &type, LogStream *l)
 	std::map<std::string, std::vector<LogStream *> >::iterator i = LogStreams.find(type);
 	if (type == "*")
 	{
-		std::map<LogStream *, std::vector<std::string> >::iterator gi = GlobalLogStreams.find(l);
-		if (gi != GlobalLogStreams.end()) GlobalLogStreams.erase(gi);
+		GlobalLogStreams.erase(l);
 	}
 
 	if (i != LogStreams.end())
@@ -293,24 +272,17 @@ 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;
-	}
-
-	va_list a;
-	static char buf[65536];
-
-	va_start(a, fmt);
-	vsnprintf(buf, 65536, fmt, a);
-	va_end(a);
 
-	this->Log(type, loglevel, std::string(buf));
+	std::string buf;
+	VAFORMAT(buf, fmt, 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)
 	{
@@ -354,8 +326,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 % 20 == 0)
 	{
 		fflush(log);
 	}