Using performLogging function

This commit is contained in:
Felipe Zimmerle
2019-03-12 13:42:06 -03:00
parent a1547eaa32
commit 7e0bc26917
4 changed files with 76 additions and 46 deletions

View File

@@ -325,20 +325,7 @@ bool RuleWithOperator::evaluate(Transaction *trans,
executeActionsIndependentOfChainedRuleResult(trans,
&containsBlock, ruleMessage);
bool isItToBeLogged = ruleMessage->m_saveMessage;
if (hasMultimatch() && isItToBeLogged) {
/* warn */
trans->m_rulesMessages.push_back(*ruleMessage);
/* error */
if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage);
}
RuleMessage *rm = new RuleMessage(this, trans);
rm->m_saveMessage = ruleMessage->m_saveMessage;
ruleMessage.reset(rm);
}
performLogging(trans, ruleMessage, false);
globalRet = true;
}
@@ -382,16 +369,7 @@ end_exec:
executeActionsAfterFullMatch(trans, containsBlock, ruleMessage);
/* last rule in the chain. */
bool isItToBeLogged = (ruleMessage->m_saveMessage && (m_chainedRuleParent == nullptr));
if (isItToBeLogged && !hasMultimatch()) {
/* warn */
trans->m_rulesMessages.push_back(*ruleMessage);
/* error */
if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage);
}
}
performLogging(trans, ruleMessage, true, true);
return true;
}