support logCb for disruptive actions

Signed-off-by: Luyao Zhong <luyao.zhong@intel.com>
This commit is contained in:
Luyao Zhong 2021-08-09 09:47:16 +00:00
parent a49249a20c
commit a48e5b86a9

View File

@ -500,17 +500,23 @@ void RuleWithActions::performLogging(Transaction *trans,
trans->m_rulesMessages.push_back(*ruleMessage);
/* error */
trans->serverLog(ruleMessage);
/*
if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage);
}
*/
}
} else if (hasBlockAction() && !hasMultimatch()) {
/* warn */
trans->m_rulesMessages.push_back(*ruleMessage);
/* error */
trans->serverLog(ruleMessage);
/*
if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage);
}
*/
} else {
if (isItToBeLogged && !hasMultimatch()
&& !ruleMessage->m_message.empty()) {
@ -518,9 +524,12 @@ void RuleWithActions::performLogging(Transaction *trans,
trans->m_rulesMessages.push_back(*ruleMessage);
/* error */
trans->serverLog(ruleMessage);
/*
if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage);
}
*/
}
}
} else {
@ -529,10 +538,12 @@ void RuleWithActions::performLogging(Transaction *trans,
trans->m_rulesMessages.push_back(*ruleMessage.get());
/* error */
trans->serverLog(ruleMessage);
/*
if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage);
}
*/
RuleMessage *rm = new RuleMessage(this, trans);
rm->m_saveMessage = ruleMessage->m_saveMessage;
ruleMessage.reset(rm);