Only calling server log if the message is not disruptive

The disruptive message is already part of the interception object
This commit is contained in:
Felipe Zimmerle 2018-10-25 18:04:27 -03:00
parent 448897d297
commit 91daeee9f6
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277

View File

@ -741,8 +741,11 @@ bool Rule::evaluate(Transaction *trans,
if (m_containsMultiMatchAction && isItToBeLogged) {
/* warn */
trans->m_rulesMessages.push_back(*ruleMessage);
/* error */
trans->serverLog(ruleMessage);
if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage);
}
RuleMessage *rm = new RuleMessage(this, trans);
rm->m_saveMessage = ruleMessage->m_saveMessage;
@ -795,14 +798,19 @@ end_exec:
&& !ruleMessage->m_message.empty()) {
/* warn */
trans->m_rulesMessages.push_back(*ruleMessage);
/* error */
trans->serverLog(ruleMessage);
if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage);
}
}
else if (m_containsStaticBlockAction && !m_containsMultiMatchAction) {
/* warn */
trans->m_rulesMessages.push_back(*ruleMessage);
/* error */
trans->serverLog(ruleMessage);
if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage);
}
}
return true;