Moves web server message to appropriate place and removing the garbage

This commit is contained in:
Felipe Zimmerle 2016-09-20 22:23:23 -03:00
parent 16b8ef98fd
commit 5553b2a5b9
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277

View File

@ -406,7 +406,7 @@ bool Rule::evaluate(Transaction *trasn) {
this->op->op + "' with parameter `" + this->op->op + "' with parameter `" +
limitTo(200, this->op->param) + limitTo(200, this->op->param) +
"' against variable `" + v->m_key + "' (Value: `" + "' against variable `" + v->m_key + "' (Value: `" +
value + "' ) \" at " + v->m_key; limitTo(100, toHexIfNeeded(value)) + "' ) \" at " + v->m_key;
} else { } else {
ruleMessage->m_match = this->op->m_match_message; ruleMessage->m_match = this->op->m_match_message;
} }
@ -526,11 +526,6 @@ bool Rule::evaluate(Transaction *trasn) {
} }
} }
} }
if (ruleMessage->m_saveMessage == true) {
ruleMessage->m_message = m_log_message;
trasn->debug(4, "Saving on the server log: " + ruleMessage->errorLog(trasn));
trasn->serverLog(ruleMessage->errorLog(trasn));
}
} else if (globalRet != true) { } else if (globalRet != true) {
#ifndef NO_LOGS #ifndef NO_LOGS
trasn->debug(4, "Rule returned 0."); trasn->debug(4, "Rule returned 0.");
@ -548,11 +543,10 @@ bool Rule::evaluate(Transaction *trasn) {
} }
} }
if ((!m_log_message.empty() || !m_log_data.empty()) if (globalRet == true && rule_id != 0 && ruleMessage->m_saveMessage == true) {
&& !ruleMessage->m_match.empty()) {
ruleMessage->m_data = m_log_data;
ruleMessage->m_message = m_log_message; ruleMessage->m_message = m_log_message;
trasn->m_rulesMessages.push_back(ruleMessage); trasn->debug(4, "Saving on the server log: " + ruleMessage->errorLog(trasn));
trasn->serverLog(ruleMessage->errorLog(trasn));
} else { } else {
delete ruleMessage; delete ruleMessage;
} }