added multiple filter capabilities
changed the single qstring log filtering to qstringlist to allow multiple filtering capabilities
This commit is contained in:
parent
977cf7340a
commit
365de1fdd0
1 changed files with 13 additions and 7 deletions
|
@ -49,19 +49,25 @@ void ServerLogger::logMessage(QString message, void *caller)
|
||||||
if (caller)
|
if (caller)
|
||||||
callerString = QString::number((qulonglong) caller, 16) + " ";
|
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);
|
QSettings *settings = new QSettings("servatrice.ini", QSettings::IniFormat);
|
||||||
bool shouldWeWriteLog = settings->value("server/writelog").toBool();
|
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){
|
if (shouldWeWriteLog){
|
||||||
QString logFilters = settings->value("server/logfilters").toString();
|
QString logFilters = settings->value("server/logfilters").toString();
|
||||||
|
QStringList listlogFilters = logFilters.split(",", QString::SkipEmptyParts);
|
||||||
bool shouldWeSkipLine = false;
|
bool shouldWeSkipLine = false;
|
||||||
if (!logFilters.trimmed().isEmpty())
|
if (!logFilters.trimmed().isEmpty()){
|
||||||
shouldWeSkipLine = !message.contains(logFilters);
|
shouldWeSkipLine = true;
|
||||||
|
foreach(QString logFilter, listlogFilters){
|
||||||
|
if (message.contains(logFilter, Qt::CaseInsensitive)){
|
||||||
|
shouldWeSkipLine = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if (shouldWeSkipLine)
|
if (shouldWeSkipLine)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue