From 365de1fdd059ad93688953dfe2ece88d66ff9d5b Mon Sep 17 00:00:00 2001
From: woogerboy21 <woogerboy21@hotmail.com>
Date: Thu, 26 Jun 2014 14:38:57 -0400
Subject: [PATCH] added multiple filter capabilities

changed the single qstring log filtering to qstringlist to allow multiple filtering capabilities
---
 servatrice/src/server_logger.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/servatrice/src/server_logger.cpp b/servatrice/src/server_logger.cpp
index 1fff3f8b..0264c2fd 100644
--- a/servatrice/src/server_logger.cpp
+++ b/servatrice/src/server_logger.cpp
@@ -49,19 +49,25 @@ void ServerLogger::logMessage(QString message, void *caller)
 	if (caller)
 		callerString = QString::number((qulonglong) caller, 16) + " ";
 		
-	//filter out all log entries based on loglevel value in configuration file
+	//filter out all log entries based on values in configuration file
 	QSettings *settings = new QSettings("servatrice.ini", QSettings::IniFormat);
 	bool shouldWeWriteLog = settings->value("server/writelog").toBool();
-	//allowedLogStatements << "Adding room: ID=" << "Starting status update clock" << "Starting server on port" << 
-	//	"Server listening." << "Server::loginUser:" << "Server::removeClient:" << "Command_Login.ext" << 
-	//	"Command_RoomSay.ext" << "Command_Message.ext" << "Command_GameSay.ext";
 	
 	if (shouldWeWriteLog){
 		QString logFilters = settings->value("server/logfilters").toString();
+		QStringList listlogFilters = logFilters.split(",", QString::SkipEmptyParts);
 		bool shouldWeSkipLine = false;
-		if (!logFilters.trimmed().isEmpty()) 
-			shouldWeSkipLine = !message.contains(logFilters);
-		
+		if (!logFilters.trimmed().isEmpty()){
+			shouldWeSkipLine = true;
+			foreach(QString logFilter, listlogFilters){ 
+				if (message.contains(logFilter, Qt::CaseInsensitive)){
+					shouldWeSkipLine = false;
+					break;
+				}
+			}
+		}
+
+
 		if (shouldWeSkipLine)
 			return;